okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix locale / allow pl to show before list loading is fully done

Browse source
This commit is contained in:
vapormusic 2022-02-15 13:30:31 +07:00
parent dfe846cff0
commit 13a1f1951f
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/renderer/index.js
View file

@ -555,7 +555,7 @@ const app = new Vue({
} }
).then(() => { ).then(() => {
if (this.page == 'playlist_' + this.showingPlaylist.id) { if (this.page == 'playlist_' + this.showingPlaylist.id) {
this.getPlaylistFromID(this.showingPlaylist.id) this.getPlaylistFromID(this.showingPlaylist.id, true)
} }
}) })
}, },
@ -997,7 +997,7 @@ const app = new Vue({
console.log(res) console.log(res)
self.appRoute(`playlist_` + res.id); self.appRoute(`playlist_` + res.id);
self.showingPlaylist = []; self.showingPlaylist = [];
self.getPlaylistFromID(app.page.substring(9)) self.getPlaylistFromID(app.page.substring(9), true)
self.playlists.listing.push({ self.playlists.listing.push({
id: res.id, id: res.id,
attributes: { attributes: {
@ -1092,7 +1092,7 @@ const app = new Vue({
response = response.data.data[0] response = response.data.data[0]
let self = this let self = this
let playlistId = response.id let playlistId = response.id
if (!transient) this.playlists.loadingState = 0 this.playlists.loadingState = (!transient) ? 0 : 1
this.showingPlaylist = response this.showingPlaylist = response
if (!response.relationships.tracks.next) { if (!response.relationships.tracks.next) {
this.playlists.loadingState = 1 this.playlists.loadingState = 1
@ -1572,14 +1572,14 @@ const app = new Vue({
if (kind == "appleCurator") { if (kind == "appleCurator") {
app.appleCurator = a.data.data[0] app.appleCurator = a.data.data[0]
} else { } else {
this.getPlaylistContinuous(a) this.getPlaylistContinuous(a, true)
} }
} }
} finally { } finally {
if (kind == "appleCurator") { if (kind == "appleCurator") {
app.appleCurator = a.data.data[0] app.appleCurator = a.data.data[0]
} else { } else {
this.getPlaylistContinuous(a) this.getPlaylistContinuous(a, true)
} }
} }
; ;
@ -3699,12 +3699,17 @@ const app = new Vue({
if (langcodes) langcodes = langcodes.map(function (u) { return u.toLowerCase() }) if (langcodes) langcodes = langcodes.map(function (u) { return u.toLowerCase() })
console.log(langcodes) console.log(langcodes)
let sellang = "" let sellang = ""
if (u && langcodes.includes(u.toLowerCase().replace('_', "-"))) { if (u && langcodes.startsWith(u.toLowerCase().replace('_', "-"))) {
sellang = ((u.toLowerCase()).replace('_', "-")) sellang = ((u.toLowerCase()).replace('_', "-"))
} else if (u && u.includes('_') && langcodes.includes(((u.toLowerCase()).replace('_', "-")).split("-")[0])) { } else if (u && u.includes('_') && langcodes.includes(((u.toLowerCase()).replace('_', "-")).split("-")[0])) {
sellang = ((u.toLowerCase()).replace('_', "-")).split("-")[0] sellang = ((u.toLowerCase()).replace('_', "-")).split("-")[0]
} }
if (sellang == "") sellang = (item.data.data[0].attributes.defaultLanguageTag).toLowerCase() if (sellang == "") sellang = (item.data.data[0].attributes.defaultLanguageTag).toLowerCase()
// Fix weird locales:
if (sellang == "iw") sellang = "iw-il"
sellang = sellang.replace(/-Han[s|t]/i, "").toLowerCase()
console.log(sellang) console.log(sellang)
return await sellang return await sellang
} }

2
src/renderer/views/components/sidebar-playlist.ejs
View file

@ -189,7 +189,7 @@
openPlaylist(item) { openPlaylist(item) {
this.$root.appRoute(`playlist_` + item.id); this.$root.appRoute(`playlist_` + item.id);
this.$root.showingPlaylist = []; this.$root.showingPlaylist = [];
this.$root.getPlaylistFromID(this.$root.page.substring(9)) this.$root.getPlaylistFromID(this.$root.page.substring(9), true)
}, },
getPlaylistChildren(item) { getPlaylistChildren(item) {
let self = this let self = this