Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

src/i18n/en_GB.jsonc

@@ -1,3 +1,5 @@
 {
+    "date.format": "${d} ${m}, ${y}",
+
     "home.friendsListeningTo": "Bruv's Listening To"
 }

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",
@@ -80,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",

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
@@ -43,7 +47,7 @@
   "term.unmute": "ミュート解除",
   "term.share": "共有",
   "term.settings": "設定",
-  "term.seeAll": "すべてを表示",
+  "term.seeAll": "すべて見る",
   "term.sortBy": "並べ替え",
   "term.sortBy.album": "アルバム",
   "term.sortBy.artist": "アーティスト",
@@ -64,6 +68,20 @@
   "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": "ウィンドウ表示",
+  "term.spacializedAudioSetting": "オーディオ空間化設定",
+  "term.clearAll": "クリア",
 
   // Home
   "home.title": "ホーム",
@@ -170,6 +188,6 @@
   
   // Web Remote
   "remote.web.title": "Cider リモート",
-  "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする",
+  "remote.web.description": "QRコードを使用して、Ciderとスマートフォンをペアリングする"
 
 }

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
@@ -64,6 +68,20 @@
   "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": "默认",
+  "term.spacializedAudioSetting": "音频空间化设置",
+  "term.clearAll": "清空",
 
   // Home
   "home.title": "主页",

src/i18n/zh_HK.jsonc

@@ -2,6 +2,8 @@
   // App info
   "app.name": "Cider",
 
+  "date.format": "${y}年${m}月${d}日", 
+
   // Dialogs
   "dialog.cancel": "取消",
   "dialog.ok": "確認",

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
@@ -64,6 +67,20 @@
   "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": "預設顯示",
+  "term.spacializedAudioSetting": "音訊空間化設定",
+  "term.clearAll": "清空",
 
   // Home
   "home.title": "主頁",
@@ -165,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
   

src/renderer/views/components/queue.ejs

@@ -33,7 +33,7 @@
             </draggable>
         </div>
         <div class="queue-footer">
-            <button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">Clear All</button>
+            <button class="md-btn" style="width:100%;" v-if="queueItems.length > 1" @click="app.mk.clearQueue();updateQueue()">{{app.getLz('term.clearAll')}}</button>
         </div>
     </div>
 </script>

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">
                         </div>
                     </div>
@@ -247,7 +247,7 @@
                                 <button class="usermenu-item" @click="toggleHideUserInfo()">
                                     <div class="row nopadding">
                                         <div class="col nopadding">
-                                            Show Personal Info
+                                            {{app.getLz('settings.option.visual.showPersonalInfo)}}
                                         </div>
                                         <div class="col-auto nopadding" v-if="!chrome.hideUserInfo">
                                             ✔️
@@ -257,7 +257,7 @@
                                 <button class="usermenu-item" @click="mk.privateEnabled = !mk.privateEnabled">
                                     <div class="row nopadding">
                                         <div class="col nopadding">
-                                            Private Session
+                                            {{app.getLz('term.privateSession')}}
                                         </div>
                                         <div class="col-auto nopadding" v-if="mk.privateEnabled">
                                             ✔️
@@ -266,22 +266,22 @@
                                 </button>
                                 <button class="usermenu-item" v-if="cfg.advanced.AudioContext && cfg.audio.spatial"
                                         @click="modals.spatialProperties = true">
-                                    Spatialized Audio Settings
+                                    {{app.getLz('term.spacializedAudioSetting')}}
                                 </button>
                                 <button class="usermenu-item" @click="appRoute('apple-account-settings')">
-                                    Account Settings
+                                    {{app.getLz('term.accountSettings')}}
                                 </button>
                                 <button class="usermenu-item" @click="appRoute('about')">
-                                    About
+                                    {{app.getLz('term.about')}}
                                 </button>
                                 <button class="usermenu-item" @click="window.open('https://discord.gg/applemusic')">
-                                    Discord
+                                    {{app.getLz('term.discord')}}
                                 </button>
                                 <button class="usermenu-item" @click="appRoute('settings')">
-                                    Settings
+                                    {{app.getLz('term.settings')}}
                                 </button>
                                 <button class="usermenu-item" @click="unauthorize()">
-                                    Sign Out
+                                    {{app.getLz('term.logout')}}
                                 </button>
                             </div>
                         </div>

src/renderer/views/pages/cider-playlist.ejs

@@ -48,7 +48,7 @@
                                         <div v-else-if="data.attributes.description.standard" class="content" v-html="data.attributes.description.standard"></div>
                                         <button v-if="data.attributes.description.short" class="more-btn"
                                                 @click="editorialNotesExpanded = !editorialNotesExpanded">
-                                           {{app.getLz('term.more')}}
+                                           {{app.getLz('term.showMore')}}
                                         </button>
                                     </div>
                                 </div>
@@ -57,7 +57,7 @@
                                 <div class="playlist-desc-expanded">
                                     <div class="content"
                                          v-html="((data.attributes.editorialNotes) ? (data.attributes.editorialNotes.standard ?? (data.attributes.editorialNotes.short ?? '') ) : (data.attributes.description ? (data.attributes.description.standard ?? (data.attributes.description.short ?? '')) : ''))"></div>
-                                    <button class="more-btn" @click="editorialNotesExpanded = !editorialNotesExpanded">{{app.getLz('term.less')}}
+                                    <button class="more-btn" @click="editorialNotesExpanded = !editorialNotesExpanded">{{app.getLz('term.showLess')}}
                                     </button>
                                 </div>
                             </template>