From 7c7d3b72d0f25d658052f2b1b8eafc75d0756002 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 16:46:40 -0800 Subject: [PATCH 01/15] Syncing languages with latest US --- src/i18n/ja_JP.jsonc | 14 +++++++++++++- src/i18n/zh_CN.jsonc | 12 ++++++++++++ src/i18n/zh_TW.jsonc | 12 ++++++++++++ src/renderer/views/pages/cider-playlist.ejs | 4 ++-- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index 60ac26a5..e1b3f033 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -43,7 +43,7 @@ "term.unmute": "ミュート解除", "term.share": "共有", "term.settings": "設定", - "term.seeAll": "すべてを表示", + "term.seeAll": "すべて見る", "term.sortBy": "並べ替え", "term.sortBy.album": "アルバム", "term.sortBy.artist": "アーティスト", @@ -64,6 +64,18 @@ "term.enabled": "ON", "term.disabled": "OFF", "term.connect": "接続", + "term.confirm": "よろしいでしょうか？", + "term.more": "もっと", + "term.less": "減らす", + "term.showMore": "もっと見る", + "term.showLess": "表示数を少なくする", + "term.topSongs" : "人気曲", + "term.latestReleases": "ニューリリース", + "term.time.added": "追加日", + "term.time.released": "配信開始日", + "term.time.updated": "最終更新日", + "term.fullscreenView": "全画面表示", + "term.defaultView": "ウィンドウ表示", // Home "home.title": "ホーム", diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index 44afaaf8..3643f7b8 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -64,6 +64,18 @@ "term.enabled": "已启用", "term.disabled": "已禁用", "term.connect": "连接", + "term.confirm": "确认？", + "term.more": "更多", + "term.less": "较少", + "term.showMore": "显示更多", + "term.showLess": "显示更少", + "term.topSongs" : "热门歌曲", + "term.latestReleases": "最新发行", + "term.time.added": "添加日期", + "term.time.released": "发行日期", + "term.time.updated": "更新日期", + "term.fullscreenView": "全屏", + "term.defaultView": "默认", // Home "home.title": "主页", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index f8ae2145..be3b1e75 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -64,6 +64,18 @@ "term.enabled": "已啟用", "term.disabled": "已停用", "term.connect": "連接", + "term.confirm": "確定？", + "term.more": "更多", + "term.less": "更少", + "term.showMore": "顯示更多", + "term.showLess": "顯示更少", + "term.topSongs" : "熱門歌曲", + "term.latestReleases": "最新發行", + "term.time.added": "加入時間", + "term.time.released": "發行時間", + "term.time.updated": "更改時間", + "term.fullscreenView": "全螢幕顯示", + "term.defaultView": "預設顯示", // Home "home.title": "主頁", diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 997fbf93..b326b8ce 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -48,7 +48,7 @@
@@ -57,7 +57,7 @@
-
From 0da1233977b86f585545416aa40f1e38c021a872 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 17:21:44 -0800 Subject: [PATCH 02/15] date format template + connection error message --- src/i18n/en_GB.jsonc | 2 ++ src/i18n/en_US.jsonc | 4 ++++ src/i18n/ja_JP.jsonc | 4 ++++ src/i18n/zh_CN.jsonc | 10 +++++++--- src/i18n/zh_HK.jsonc | 2 ++ src/i18n/zh_TW.jsonc | 9 ++++++--- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/i18n/en_GB.jsonc b/src/i18n/en_GB.jsonc index 0788726a..1b5fdd9f 100644 --- a/src/i18n/en_GB.jsonc +++ b/src/i18n/en_GB.jsonc @@ -1,3 +1,5 @@ { + "date.format": "${d} ${m}, ${y}", + "home.friendsListeningTo": "Bruv's Listening To" } \ No newline at end of file diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 31ffff52..48955436 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -1,6 +1,9 @@ { // Base File // App info "app.name": "Cider", + + "date.format": "${m} ${d}, ${y}", + // Dialogs "dialog.cancel": "Cancel", "dialog.ok": "OK", @@ -9,6 +12,7 @@ "notification.updatingLibrarySongs": "Updating library songs...", "notification.updatingLibraryAlbums": "Updating library albums...", "notification.updatingLibraryArtists": "Updating library artists...", + "notification.connectionError": "There was a problem connecting to Apple Music.", // Terms "term.appleMusic": "Apple Music", diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index e1b3f033..a57bd8a4 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -1,6 +1,9 @@ { // App info "app.name": "Cider", + + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "キャンセル", "dialog.ok": "OK", @@ -9,6 +12,7 @@ "notification.updatingLibrarySongs": "ライブラリの更新中...", "notification.updatingLibraryAlbums": "ライブラリの更新中...", "notification.updatingLibraryArtists": "ライブラリの更新中...", + "notification.connectionError": "Apple Musicに接続できません。", // Terms "term.appleMusic": "Apple Music", // Follows brand term diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index 3643f7b8..8ef9313f 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -1,6 +1,9 @@ { // App info "app.name": "Cider", + + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "取消", "dialog.ok": "确定", @@ -9,6 +12,7 @@ "notification.updatingLibrarySongs": "正在更新资料库的歌曲信息...", "notification.updatingLibraryAlbums": "正在更新资料库的专辑信息...", "notification.updatingLibraryArtists": "正在更新资料库的艺人信息...", + "notification.connectionError": "无法连接到 Apple Music。", // Terms "term.appleMusic": "Apple Music", // Follows brand term @@ -71,9 +75,9 @@ "term.showLess": "显示更少", "term.topSongs" : "热门歌曲", "term.latestReleases": "最新发行", - "term.time.added": "添加日期", - "term.time.released": "发行日期", - "term.time.updated": "更新日期", + "term.time.added": "添加于", + "term.time.released": "发行于", + "term.time.updated": "更新于", "term.fullscreenView": "全屏", "term.defaultView": "默认", diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc index f9b1e609..3d71573d 100644 --- a/src/i18n/zh_HK.jsonc +++ b/src/i18n/zh_HK.jsonc @@ -2,6 +2,8 @@ // App info "app.name": "Cider", + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "取消", "dialog.ok": "確認", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index be3b1e75..b7a24659 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -2,6 +2,8 @@ // App info "app.name": "Cider", + "date.format": "${y}年${m}月${d}日", + // Dialogs "dialog.cancel": "取消", "dialog.ok": "OK", @@ -10,6 +12,7 @@ "notification.updatingLibrarySongs": "正在更新資料庫的歌曲...", "notification.updatingLibraryAlbums": "正在更新資料庫的專輯...", "notification.updatingLibraryArtists": "正在更新資料庫的藝人...", + "notification.connectionError": "無法連接到 Apple Music。", // Terms "term.appleMusic": "Apple Music", // Follows brand term "term.applePodcasts": "Apple Podcasts", // Follows brand term @@ -71,9 +74,9 @@ "term.showLess": "顯示更少", "term.topSongs" : "熱門歌曲", "term.latestReleases": "最新發行", - "term.time.added": "加入時間", - "term.time.released": "發行時間", - "term.time.updated": "更改時間", + "term.time.added": "加入于", + "term.time.released": "發行于", + "term.time.updated": "更改于", "term.fullscreenView": "全螢幕顯示", "term.defaultView": "預設顯示", From c0b14db8ddd4f366a0efd3882bdc5a78ed72688d Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 18:04:05 -0800 Subject: [PATCH 03/15] Added new strings + Substituted some menu item i18n --- src/i18n/en_US.jsonc | 3 ++- src/i18n/ja_JP.jsonc | 4 +++- src/i18n/zh_CN.jsonc | 2 ++ src/i18n/zh_TW.jsonc | 4 +++- src/renderer/views/components/queue.ejs | 2 +- src/renderer/views/main.ejs | 18 +++++++++--------- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 48955436..2499978b 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -84,7 +84,8 @@ "term.time.updated": "Updated", "term.fullscreenView": "Fullscreen View", "term.defaultView": "Default View", - + "term.spacializedAudioSetting": "Spacialized Audio Setting", + "term.clearAll": "Clear All", // Home "home.title": "Home", diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index a57bd8a4..7da1f480 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -80,6 +80,8 @@ "term.time.updated": "最終更新日", "term.fullscreenView": "全画面表示", "term.defaultView": "ウィンドウ表示", + "term.spacializedAudioSetting": "オーディオ空間化設定", + "term.clearAll": "クリア", // Home "home.title": "ホーム", @@ -186,6 +188,6 @@ // Web Remote "remote.web.title": "Cider リモート", - "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする", + "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする" } diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index 8ef9313f..e1d58b83 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -80,6 +80,8 @@ "term.time.updated": "更新于", "term.fullscreenView": "全屏", "term.defaultView": "默认", + "term.spacializedAudioSetting": "音频空间化设置", + "term.clearAll": "清空", // Home "home.title": "主页", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index b7a24659..eb5d76a5 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -79,6 +79,8 @@ "term.time.updated": "更改于", "term.fullscreenView": "全螢幕顯示", "term.defaultView": "預設顯示", + "term.spacializedAudioSetting": "音訊空間化設定", + "term.clearAll": "清空", // Home "home.title": "主頁", @@ -180,7 +182,7 @@ // Settings - Experimental "settings.header.experimental": "實驗性功能", - "settings.header.experimental.description": "調整Cider的實驗性功能", + "settings.header.experimental.description": "調整 Cider 的實驗性功能", "settings.option.experimental.compactUI": "緊凑型UI", // Toggle // Refer to term.disabled & term.enabled diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs index ed557295..3fa55806 100644 --- a/src/renderer/views/components/queue.ejs +++ b/src/renderer/views/components/queue.ejs @@ -33,7 +33,7 @@
- +
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 300467c3..9203a773 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -188,7 +188,7 @@ @focus="search.showHints = true" @blur="setTimeout(()=>{search.showHints = false}, 300)" v-on:keyup.enter="searchQuery();search.showHints = false" @change="showSearch();" - @input="getSearchHints()" placeholder="Search..." v-model="search.term" + @input="getSearchHints()" placeholder="{app.getLz('term.search')}" v-model="search.term" ref="searchInput" class="search-input"> @@ -247,7 +247,7 @@ From 158fe502cbb4b951cb5fcd4352aad61f7ecbe353 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 19:20:46 -0800 Subject: [PATCH 04/15] Certified monkey in nihongo --- src/i18n/ja_JP.jsonc | 6 +++--- src/renderer/views/main.ejs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index 7da1f480..680deb96 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -55,9 +55,9 @@ "term.sortBy.genre": "ジャンル", "term.sortBy.releaseDate": "配信開始日", "term.sortBy.duration": "時間", - "term.sortOrder": "アルファベット順", - "term.sortOrder.ascending": "A-Z順", - "term.sortOrder.descending": "Z-A順", + "term.sortOrder": "並べ替え", + "term.sortOrder.ascending": "昇順", + "term.sortOrder.descending": "降順", "term.viewAs": "表示", "term.viewAs.coverArt": "カバーアート", "term.viewAs.list": "リスト", diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 20317417..1eadad42 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -188,7 +188,7 @@ @focus="search.showHints = true" @blur="setTimeout(()=>{search.showHints = false}, 300)" v-on:keyup.enter="searchQuery();search.showHints = false" @change="showSearch();" - @input="getSearchHints()" :placeholder="$root.getLz('term.search') + ' ...'" v-model="search.term" + @input="getSearchHints()" :placeholder="$root.getLz('term.search') + '...'" v-model="search.term" ref="searchInput" class="search-input"> From 0359bffac523d743a587adbf6ccee9f6c2ea708e Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 19:24:11 -0800 Subject: [PATCH 05/15] Notification i18n --- src/renderer/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 95e7b1a5..f4a01ca9 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -1710,7 +1710,7 @@ const app = new Vue({ } this.library.songs.downloadState = 1 this.library.downloadNotification.show = true - this.library.downloadNotification.message = "Updating library songs..." + this.library.downloadNotification.message = app.getLz('notification.updatingLibrarySongs') function downloadChunk() { const params = { @@ -1791,7 +1791,7 @@ const app = new Vue({ } this.library.albums.downloadState = 1 this.library.downloadNotification.show = true - this.library.downloadNotification.message = "Updating library albums..." + this.library.downloadNotification.message = app.getLz('notification.updatingLibraryAlbums') function downloadChunk() { self.library.albums.downloadState = 1 @@ -1871,7 +1871,7 @@ const app = new Vue({ } this.library.artists.downloadState = 1 this.library.downloadNotification.show = true - this.library.downloadNotification.message = "Updating library artists..." + this.library.downloadNotification.message = app.getLz('notification.updatingLibraryArtists') function downloadChunk() { self.library.artists.downloadState = 1 From 9c0dca80011aacaf71906430bd25d8f0f05f08fa Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 24 Jan 2022 20:07:00 -0800 Subject: [PATCH 06/15] Finalized i18n Draft Before Testing --- src/i18n/en_US.jsonc | 13 ++- src/i18n/ja_JP.jsonc | 6 +- src/i18n/zh_CN.jsonc | 3 +- src/i18n/zh_TW.jsonc | 3 +- src/renderer/index.js | 28 ++--- .../views/components/add-to-playlist.ejs | 2 +- src/renderer/views/main.ejs | 8 +- src/renderer/views/pages/home.ejs | 10 +- src/renderer/views/pages/podcasts.ejs | 2 +- src/renderer/views/pages/settings.ejs | 102 +++++++++--------- 10 files changed, 96 insertions(+), 81 deletions(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 2499978b..cafb18d5 100644 --- a/src/i18n/en_US.jsonc +++ b/src/i18n/en_US.jsonc @@ -12,7 +12,6 @@ "notification.updatingLibrarySongs": "Updating library songs...", "notification.updatingLibraryAlbums": "Updating library albums...", "notification.updatingLibraryArtists": "Updating library artists...", - "notification.connectionError": "There was a problem connecting to Apple Music.", // Terms "term.appleMusic": "Apple Music", @@ -86,17 +85,22 @@ "term.defaultView": "Default View", "term.spacializedAudioSetting": "Spacialized Audio Setting", "term.clearAll": "Clear All", + "term.recentStations": "Recent Stations", + "term.language": "Language", // Home "home.title": "Home", "home.recentlyPlayed": "Recently Played", "home.recentlyAdded": "Recently Added", "home.artistsFeed": "Your Artists Feed", + "home.artistsFeed.noArtist": "Follow some artists first and their latest releases will be here", "home.madeForYou": "Made For You", "home.friendsListeningTo": "Friends Listening To", "home.followedArtists": "Followed Artists", + // Errors "error.appleMusicSubRequired": "Apple Music requires a subscription.", + "error.connectionError": "There was a problem connecting to Apple Music.", // Actions "action.addToLibrary": "Add to Library", @@ -160,9 +164,11 @@ "settings.header.visual.animatedArtworkQuality.low": "Low", "settings.header.visual.animatedArtworkQuality.medium": "Medium", "settings.header.visual.animatedArtworkQuality.high": "High", + "settings.header.visual.animatedArtworkQuality.veryHigh": "Very High", "settings.header.visual.animatedArtworkQuality.extreme": "Extreme", "settings.option.visual.animatedWindowBackground": "Animated Window Background", // Toggle "settings.option.visual.hardwareAcceleration": "Hardware Acceleration", // Dropdown + "settings.option.visual.hardwareAcceleration.description": "Requires relaunch", "settings.header.visual.hardwareAcceleration.default": "Default", "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", // Refer to term.disabled for the disabled option @@ -186,7 +192,7 @@ // Refer to term.disabled for the disabled option "settings.header.connectivity.discordRPC.cider": "Display as 'Cider'", "settings.header.connectivity.discordRPC.appleMusic": "Display as 'Apple Music'", - "settings.header.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", // Toggle + "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", // Toggle "settings.option.connectivity.lastfmScrobble": "LastFM Scrobbling", // Option to Connect // Refer to term.connect for the connect button @@ -196,6 +202,9 @@ "settings.option.experimental.compactUI": "Compact UI", // Toggle // Refer to term.disabled & term.enabled + // Settings - Unfinished + "settings.header.unfinished": "Unfinished", + // Web Remote "remote.web.title": "Cider Remote", "remote.web.description": "Scan the QR code to pair your phone up with this Cider instance" diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index 680deb96..a480d57d 100644 --- a/src/i18n/ja_JP.jsonc +++ b/src/i18n/ja_JP.jsonc @@ -12,7 +12,6 @@ "notification.updatingLibrarySongs": "ライブラリの更新中...", "notification.updatingLibraryAlbums": "ライブラリの更新中...", "notification.updatingLibraryArtists": "ライブラリの更新中...", - "notification.connectionError": "Apple Musicに接続できません。", // Terms "term.appleMusic": "Apple Music", // Follows brand term @@ -61,6 +60,7 @@ "term.viewAs": "表示", "term.viewAs.coverArt": "カバーアート", "term.viewAs.list": "リスト", + "term.size": "サイズ", "term.size.normal": "普通", "term.size.compact": "コンパクト", "term.enable": "ON", @@ -73,7 +73,7 @@ "term.less": "減らす", "term.showMore": "もっと見る", "term.showLess": "表示数を少なくする", - "term.topSongs" : "人気曲", + "term.topSongs" : "トップソング", "term.latestReleases": "ニューリリース", "term.time.added": "追加日", "term.time.released": "配信開始日", @@ -93,6 +93,8 @@ "home.followedArtists": "フォローしているアーティスト", // Errors "error.appleMusicSubRequired": "Apple Musicのサブスクリプションが必要です。", + "error.connectionError": "Apple Musicに接続できません。", + // Actions "action.addToLibrary": "ライブラリに追加", "action.addToLibrary.success": "ライブラリに追加されました", diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index e1d58b83..800b88bb 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -12,7 +12,6 @@ "notification.updatingLibrarySongs": "正在更新资料库的歌曲信息...", "notification.updatingLibraryAlbums": "正在更新资料库的专辑信息...", "notification.updatingLibraryArtists": "正在更新资料库的艺人信息...", - "notification.connectionError": "无法连接到 Apple Music。", // Terms "term.appleMusic": "Apple Music", // Follows brand term @@ -61,6 +60,7 @@ "term.viewAs": "显示模式", "term.viewAs.coverArt": "专辑封面", "term.viewAs.list": "列表", + "term.size": "大小", "term.size.normal": "正常", "term.size.compact": "紧凑", "term.enable": "启用", @@ -94,6 +94,7 @@ // Errors "error.appleMusicSubRequired": "需要订阅 Apple Music 以使用 Cider", + "error.connectionError": "无法连接到 Apple Music。", // Actions "action.addToLibrary": "加入资料库", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index eb5d76a5..8a7417f7 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -12,7 +12,6 @@ "notification.updatingLibrarySongs": "正在更新資料庫的歌曲...", "notification.updatingLibraryAlbums": "正在更新資料庫的專輯...", "notification.updatingLibraryArtists": "正在更新資料庫的藝人...", - "notification.connectionError": "無法連接到 Apple Music。", // Terms "term.appleMusic": "Apple Music", // Follows brand term "term.applePodcasts": "Apple Podcasts", // Follows brand term @@ -60,6 +59,7 @@ "term.viewAs": "顯示模式", "term.viewAs.coverArt": "專輯封面", "term.viewAs.list": "列表", + "term.size": "大小", "term.size.normal": "正常", "term.size.compact": "緊凑", "term.enable": "啟用", @@ -92,6 +92,7 @@ "home.followedArtists": "追蹤的藝人", // Errors "error.appleMusicSubRequired": "需要訂閱Apple Music以使用Cider", + "error.connectionError": "無法連接到 Apple Music。", // Actions "action.addToLibrary": "加入資料庫", "action.addToLibrary.success": "成功加入資料庫", diff --git a/src/renderer/index.js b/src/renderer/index.js index f4a01ca9..cfbafa4a 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -178,12 +178,12 @@ const app = new Vue({ }, songs: { sortingOptions: { - "albumName": "Album", - "artistName": "Artist", - "name": "Name", - "genre": "Genre", - "releaseDate": "Release Date", - "durationInMillis": "Duration" + "albumName": app.getLz('term.sortBy.album'), + "artistName": app.getLz('term.sortBy.artist'), + "name": app.getLz('term.sortBy.name'), + "genre": app.getLz('term.sortBy.genre'), + "releaseDate": app.getLz('term.sortBy.releaseDate'), + "durationInMillis": app.getLz('term.sortBy.duration') }, sorting: "name", sortOrder: "asc", @@ -195,10 +195,10 @@ const app = new Vue({ }, albums: { sortingOptions: { - "artistName": "Artist", - "name": "Name", - "genre": "Genre", - "releaseDate": "Release Date" + "albumName": app.getLz('term.sortBy.album'), + "artistName": app.getLz('term.sortBy.artist'), + "name": app.getLz('term.sortBy.name'), + "genre": app.getLz('term.sortBy.genre') }, viewAs: 'covers', sorting: ["dateAdded", "name"], // [0] = recentlyadded page, [1] = albums page @@ -211,10 +211,10 @@ const app = new Vue({ }, artists: { sortingOptions: { - "artistName": "Artist", - "name": "Name", - "genre": "Genre", - "releaseDate": "Release Date" + "artistName": app.getLz('term.sortBy.artist'), + "name": app.getLz('term.sortBy.name'), + "genre": app.getLz('term.sortBy.genre'), + "releaseDate": app.getLz('term.sortBy.releaseDate') }, viewAs: 'covers', sorting: ["dateAdded", "name"], // [0] = recentlyadded page, [1] = albums page diff --git a/src/renderer/views/components/add-to-playlist.ejs b/src/renderer/views/components/add-to-playlist.ejs index 97de9256..eb92074e 100644 --- a/src/renderer/views/components/add-to-playlist.ejs +++ b/src/renderer/views/components/add-to-playlist.ejs @@ -21,7 +21,7 @@ ref="searchInput" style="width:100%;" spellcheck="false" - placeholder="Search..." + :placeholder="app.getLz('term.search') + '...'" v-model="searchQuery" @input="search()" class="search-input"> diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 1eadad42..9f1cc11b 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -466,7 +466,7 @@
-

Browse

+

{{$root.getLz('term.browse')}}

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed euismod, urna eu tincidunt @@ -485,7 +485,7 @@

-

Listen Now

+

{{$root.getLz('term.listenNow')}}

990kbps
@@ -509,8 +509,8 @@ diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs index 0480463e..3f6dda0f 100644 --- a/src/renderer/views/pages/home.ejs +++ b/src/renderer/views/pages/home.ejs @@ -3,7 +3,7 @@
-

Recently Played

+

{{$root.getLz('home.recentlyPlayed')}}

-
Follow some artists first and their latest releases will be here
+
{{$root.getLz('home.artistsFeed.noArtist')}}
@@ -44,7 +44,7 @@
-

Made For You

+

{{$root.getLz('home.madeForYou')}}

-

{{ app.getLz('term.about') }} {{ data.attributes.name }}

+

{{ $root.getLz('term.about') }} {{ data.attributes.name }}

@@ -164,14 +164,14 @@ let followActions = { follow: { icon: "./assets/feather/plus-circle.svg", - name: app.getLz('action.follow'), + name: $root.getLz('action.follow'), action: ()=>{ self.app.cfg.home.followedArtists.push(self.data.id) } }, unfollow: { icon: "./assets/feather/x-circle.svg", - name: app.getLz('action.unfollow'), + name: $root.getLz('action.unfollow'), action: ()=>{ let index = self.app.cfg.home.followedArtists.indexOf(self.data.id) if (index > -1) { @@ -187,7 +187,7 @@ items: [ { icon: "./assets/feather/play.svg", - name: app.getLz('action.startRadio'), + name: $root.getLz('action.startRadio'), action: ()=>{ app.mk.setStationQueue({artist:self.data.id}).then(()=>{ app.mk.play() @@ -197,7 +197,7 @@ followActions[followAction], { icon: "./assets/feather/share.svg", - name: app.getLz('action.share'), + name: $root.getLz('action.share'), action: ()=>{ self.app.copyToClipboard(self.data.attributes.url) } diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index b326b8ce..02429039 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -48,7 +48,7 @@
@@ -57,26 +57,26 @@
-
@@ -318,7 +318,7 @@ return { normal: [ { - name: app.getLz('action.removeFromPlaylist'), + name: $root.getLz('action.removeFromPlaylist'), action: () => { self.remove() } @@ -326,7 +326,7 @@ ], multiple: [ { - name: app.getLz('action.removeFromPlaylist'), + name: $root.getLz('action.removeFromPlaylist'), action: () => { self.remove() } @@ -429,13 +429,13 @@ if (date == null || date === "") return ""; switch (date) { case this.data.attributes.releaseDate: - prefix = this.app.getLz('term.time.released')+ ' ' + prefix = this.$root.getLz('term.time.released')+ ' ' break; case this.data.attributes.lastModifiedDate: - prefix = this.app.getLz('term.time.updated')+ ' ' + prefix = this.$root.getLz('term.time.updated')+ ' ' break; case this.data.attributes.dateAdded: - prefix = this.app.getLz('term.time.added')+ ' ' + prefix = this.$root.getLz('term.time.added')+ ' ' break; } let month, year; diff --git a/src/renderer/views/pages/collection-list.ejs b/src/renderer/views/pages/collection-list.ejs index 391206ba..92928e64 100644 --- a/src/renderer/views/pages/collection-list.ejs +++ b/src/renderer/views/pages/collection-list.ejs @@ -15,7 +15,7 @@
diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs index 3f6dda0f..1c9a4c86 100644 --- a/src/renderer/views/pages/home.ejs +++ b/src/renderer/views/pages/home.ejs @@ -18,7 +18,7 @@

{{$root.getLz('home.artistsFeed')}}

- +
@@ -60,7 +60,7 @@

{{$root.getLz('home.friendsListeningTo')}}

- +
diff --git a/src/renderer/views/pages/library-songs.ejs b/src/renderer/views/pages/library-songs.ejs index 567d2884..7ac34ab7 100644 --- a/src/renderer/views/pages/library-songs.ejs +++ b/src/renderer/views/pages/library-songs.ejs @@ -10,7 +10,7 @@
@@ -19,24 +19,24 @@
diff --git a/src/renderer/views/pages/listen_now.ejs b/src/renderer/views/pages/listen_now.ejs index d33a44ec..62e35eef 100644 --- a/src/renderer/views/pages/listen_now.ejs +++ b/src/renderer/views/pages/listen_now.ejs @@ -1,6 +1,6 @@ @@ -76,7 +76,7 @@ let menus = { single: { items: [{ - "name": $root.getLz('action.removeFromQueue'), + "name": app.getLz('action.removeFromQueue'), "action": function () { self.queueItems.splice(position, 1) app.mk.queue._queueItems = self.queueItems; @@ -84,7 +84,7 @@ } }, { - "name": $root.getLz('action.startRadio'), + "name": app.getLz('action.startRadio'), "action": function () { app.mk.setStationQueue({ song: item.attributes.playParams.id ?? item.id diff --git a/src/renderer/views/components/sidebar-playlist.ejs b/src/renderer/views/components/sidebar-playlist.ejs index e9c03b37..e3ca769f 100644 --- a/src/renderer/views/components/sidebar-playlist.ejs +++ b/src/renderer/views/components/sidebar-playlist.ejs @@ -105,7 +105,7 @@ let menu = { items: { "moveToParent": { - name: $root.getLz('action.moveToTop'), + name: this.$root.getLz('action.moveToTop'), action: () => { let self = this this.move(this.item, { @@ -116,7 +116,7 @@ } }, "rename": { - name: $root.getLz('action.rename'), + name: this.$root.getLz('action.rename'), action: () => { this.renaming = true setTimeout(()=>{ @@ -126,13 +126,13 @@ } }, "deleteFromPlaylist": { - name: $root.getLz('action.removeFromLibrary'), + name: this.$root.getLz('action.removeFromLibrary'), action: () => { this.$root.deletePlaylist(playlist_id) } }, "addToFavorites": { - name: $root.getLz('action.addToFavorites'), + name: this.$root.getLz('action.addToFavorites'), disabled: true, hidden: true, action: () => { diff --git a/src/renderer/views/pages/artist-feed.ejs b/src/renderer/views/pages/artist-feed.ejs index 1bf68087..2a354bd8 100644 --- a/src/renderer/views/pages/artist-feed.ejs +++ b/src/renderer/views/pages/artist-feed.ejs @@ -5,7 +5,7 @@
-

{{$root.getLz('home.followedArtists')}}

+

{{app.getLz('home.followedArtists')}}

@@ -15,7 +15,7 @@
{{app.getLz('action.unfollow')}}
@@ -30,7 +30,7 @@
-

{{$root.getLz('home.artistsFeed')}}

+

{{app.getLz('home.artistsFeed')}}

diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs index 05fa3334..07300f6f 100644 --- a/src/renderer/views/pages/artist.ejs +++ b/src/renderer/views/pages/artist.ejs @@ -60,7 +60,7 @@
-

{{$root.getLz('term.latestReleases')}}

+

{{app.getLz('term.latestReleases')}}

@@ -70,10 +70,10 @@
-

{{$root.getLz('term.topSongs')}}

+

{{app.getLz('term.topSongs')}}

- +
@@ -120,7 +120,7 @@
-

{{ $root.getLz('term.about') }} {{ data.attributes.name }}

+

{{ app.getLz('term.about') }} {{ data.attributes.name }}

@@ -164,14 +164,14 @@ let followActions = { follow: { icon: "./assets/feather/plus-circle.svg", - name: $root.getLz('action.follow'), + name: app.getLz('action.follow'), action: ()=>{ self.app.cfg.home.followedArtists.push(self.data.id) } }, unfollow: { icon: "./assets/feather/x-circle.svg", - name: $root.getLz('action.unfollow'), + name: app.getLz('action.unfollow'), action: ()=>{ let index = self.app.cfg.home.followedArtists.indexOf(self.data.id) if (index > -1) { @@ -187,7 +187,7 @@ items: [ { icon: "./assets/feather/play.svg", - name: $root.getLz('action.startRadio'), + name: app.getLz('action.startRadio'), action: ()=>{ app.mk.setStationQueue({artist:self.data.id}).then(()=>{ app.mk.play() @@ -197,7 +197,7 @@ followActions[followAction], { icon: "./assets/feather/share.svg", - name: $root.getLz('action.share'), + name: app.getLz('action.share'), action: ()=>{ self.app.copyToClipboard(self.data.attributes.url) } diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index 02429039..b326b8ce 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -48,7 +48,7 @@
@@ -57,26 +57,26 @@
-
@@ -318,7 +318,7 @@ return { normal: [ { - name: $root.getLz('action.removeFromPlaylist'), + name: app.getLz('action.removeFromPlaylist'), action: () => { self.remove() } @@ -326,7 +326,7 @@ ], multiple: [ { - name: $root.getLz('action.removeFromPlaylist'), + name: app.getLz('action.removeFromPlaylist'), action: () => { self.remove() } @@ -429,13 +429,13 @@ if (date == null || date === "") return ""; switch (date) { case this.data.attributes.releaseDate: - prefix = this.$root.getLz('term.time.released')+ ' ' + prefix = this.app.getLz('term.time.released')+ ' ' break; case this.data.attributes.lastModifiedDate: - prefix = this.$root.getLz('term.time.updated')+ ' ' + prefix = this.app.getLz('term.time.updated')+ ' ' break; case this.data.attributes.dateAdded: - prefix = this.$root.getLz('term.time.added')+ ' ' + prefix = this.app.getLz('term.time.added')+ ' ' break; } let month, year; diff --git a/src/renderer/views/pages/collection-list.ejs b/src/renderer/views/pages/collection-list.ejs index 92928e64..d9cc6ca9 100644 --- a/src/renderer/views/pages/collection-list.ejs +++ b/src/renderer/views/pages/collection-list.ejs @@ -15,7 +15,7 @@
diff --git a/src/renderer/views/pages/home.ejs b/src/renderer/views/pages/home.ejs index 1c9a4c86..c728deaf 100644 --- a/src/renderer/views/pages/home.ejs +++ b/src/renderer/views/pages/home.ejs @@ -3,7 +3,7 @@
-

{{$root.getLz('home.recentlyPlayed')}}

+

{{app.getLz('home.recentlyPlayed')}}

-
{{$root.getLz('home.artistsFeed.noArtist')}}
+
{{app.getLz('home.artistsFeed.noArtist')}}
@@ -44,7 +44,7 @@
-

{{$root.getLz('home.madeForYou')}}

+

{{app.getLz('home.madeForYou')}}