Revert "full i18n for web remote and existing strings modification"

This reverts commit 6d0b926b1e.

src/i18n/en_US.jsonc

@@ -100,8 +100,6 @@
   "term.contributors": "Contributors",
   "term.equalizer": "Equalizer",
   "term.reset": "Reset",
-  "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks 
-  
 
   // Home
   "home.title": "Home",
@@ -162,9 +160,6 @@
   "action.dislike": "Dislike",
   "action.undoDislike": "Undo dislike",
   "action.showWebRemoteQR": "Show Web Remote QR",
-  "action.playTracksNext": "Play ${app.selectedMediaItems.length} tracks next",
-  "action.playTracksLater": "Play ${app.selectedMediaItems.length} tracks later",
-  "action.removeTracks": "Remove ${self.selectedItems.length} tracks from queue",
 
   // Settings - Audio
   "settings.header.audio": "Audio",

src/i18n/ja_JP.jsonc

@@ -84,7 +84,7 @@
   "term.fullscreenView": "全画面表示",
   "term.defaultView": "ウィンドウ表示",
   "term.spacializedAudioSetting": "オーディオ空間化設定",
-  "term.clearAll": "消去",
+  "term.clearAll": "クリア",
   "term.recentStations": "最近の再生",
   "term.language": "言語",
   "term.noLyrics": "ローディング。。 / 歌詞が見つからない / 器楽曲.",
@@ -97,7 +97,6 @@
   "term.contributors": "貢献者",
   "term.equalizer": "イコライザー",
   "term.reset": "リセット",
-  "term.tracks": "曲", // Assume x amount of tracks. e.g. 50 tracks 
 
   // Home
   "home.title": "ホーム",
@@ -130,14 +129,14 @@
   "action.addToLibrary.error": "ライブラリへの追加に失敗しました",
   "action.removeFromLibrary": "ライブラリから削除",
   "action.removeFromLibrary.success": "ライブラリから削除されました",
-  "action.addToQueue": "「次はこちら」に項目を追加",
+  "action.addToQueue": "キューに追加",
-  "action.addToQueue.success": "「次はこちら」に項目を追加されました",
+  "action.addToQueue.success": "キューに追加されました",
   "action.addToQueue.error": "操作を完了できませんでした",
   "action.addToPlaylist": "プレイリストに追加",
   "action.removeFromPlaylist": "プレイリストから削除",
-  "action.addToFavorites": "ラブに追加",
+  "action.addToFavorites": " ",
-  "action.removeFromQueue": "「次はこちら」から項目を削除",
+  "action.removeFromQueue": "キューから削除",
-  "action.removeFromQueue.success": "「次はこちら」から項目を削除されました",
+  "action.removeFromQueue.success": "キューから削除されました",
   "action.removeFromQueue.error": "操作を完了できませんでした",
   "action.follow": "フォロー",
   "action.follow.success": "フォロー中",
@@ -158,10 +157,6 @@
   "action.dislike": "これに似たものをすすめない",
   "action.undoDislike": "「これと似た曲のおすすめを減らす」を取り消す",
   "action.showWebRemoteQR": "WEBリモコンQRコードを表示",
-  "action.playTracksNext": "${app.selectedMediaItems.length}曲が次に再生",
-  "action.playTracksLater": "${app.selectedMediaItems.length}曲が最後に再生",
-  "action.removeTracks": "${self.selectedItems.length}曲が「次はこちら」から削除",
-
   // Settings - Audio
   "settings.header.audio": "オーディオ",
   "settings.header.audio.description": "Ciderのオーディオ設定",

src/i18n/zh_CN.jsonc

@@ -97,7 +97,6 @@
   "term.contributors": "贡献者",
   "term.equalizer": "均衡器",
   "term.reset": "重置",
-  "term.tracks": "首歌曲", // Assume x amount of tracks. e.g. 50 tracks 
 
   // Home
   "home.title": "主页",
@@ -160,10 +159,6 @@
   "action.dislike": "减少此类建议",
   "action.undoDislike": "增加此类建议",
   "action.showWebRemoteQR": "显示远程控制的二维码",
-  "action.playTracksNext": "插播 ${app.selectedMediaItems.length} 首歌曲",
-  "action.playTracksLater": "最后播放 ${app.selectedMediaItems.length} 首歌曲",
-  "action.removeTracks": "从队列中移除 ${self.selectedItems.length} 首歌曲",
-
   // Settings - Audio
   "settings.header.audio": "音频",
   "settings.header.audio.description": "调整 Cider 的音频设置",

src/i18n/zh_TW.jsonc

@@ -96,8 +96,6 @@
   "term.contributors": "貢獻者",
   "term.equalizer": "等化器",
   "term.reset": "重置",
-  "term.tracks": "首歌曲", // Assume x amount of tracks. e.g. 50 tracks 
-
   
   // Home
   "home.title": "主頁",
@@ -158,9 +156,6 @@
   "action.dislike": "減少此類建議",
   "action.undoDislike": "還原減小此類建議",
   "action.showWebRemoteQR": "顯示遠程遙控行動條碼",
-  "action.playTracksNext": "插播 ${app.selectedMediaItems.length} 首歌曲",
-  "action.playTracksLater": "最後播放 ${app.selectedMediaItems.length} 首歌曲",
-  "action.removeTracks": "從待播清單刪除 ${self.selectedItems.length} 首歌曲",
   
   // Settings - Audio
   "settings.header.audio": "音訊",

src/renderer/views/components/mediaitem-list-item.ejs

@@ -238,7 +238,7 @@
                                 }
                             },
                             {
-                                name: app.getLz('action.playTracksNext'),
+                                name: `Play ${app.selectedMediaItems.length} tracks next`,
                                 "icon": "./assets/arrow-bend-up.svg",
                                 action: () => {
                                     let itemsToPlay = {}
@@ -260,7 +260,7 @@
                                 }
                             },
                             {
-                                name: app.getLz('action.playTracksLater'),
+                                name: `Play ${app.selectedMediaItems.length} tracks later`,
                                 "icon": "./assets/arrow-bend-down.svg",
                                 action: () => {
                                     let itemsToPlay = {}

src/renderer/views/components/mediaitem-square-large.ejs

@@ -144,7 +144,7 @@
                     multiple: {
                         items: [
                             {
-                                name: this.$root.getLz('action.playTracksNext'),
+                                name: `Play ${app.selectedMediaItems.length} tracks next`,
                                 action: () => {
                                     let itemsToPlay = {}
                                     app.selectedMediaItems.forEach(item => {
@@ -165,7 +165,7 @@
                                 }
                             },
                             {
-                                name: app.getLz('action.playTracksLater'),
+                                name: `Play ${app.selectedMediaItems.length} tracks later`,
                                 action: () => {
                                     let itemsToPlay = {}
                                     app.selectedMediaItems.forEach(item => {

src/renderer/views/components/mediaitem-square-sp.ejs

@@ -158,7 +158,7 @@
                     multiple: {
                         items: [
                             {
-                                name: app.getLz('action.playTracksNext'),
+                                name: `Play ${app.selectedMediaItems.length} tracks next`,
                                 action: () => {
                                     let itemsToPlay = {}
                                     app.selectedMediaItems.forEach(item => {
@@ -179,7 +179,7 @@
                                 }
                             },
                             {
-                                name: app.getLz('action.playTracksLater'),
+                                name: `Play ${app.selectedMediaItems.length} tracks later`,
                                 action: () => {
                                     let itemsToPlay = {}
                                     app.selectedMediaItems.forEach(item => {

src/renderer/views/components/mediaitem-square.ejs

@@ -250,7 +250,7 @@
                     multiple: {
                         items: [
                             {
-                                name: app.getLz('action.playTracksNext'),
+                                name: `Play ${app.selectedMediaItems.length} tracks next`,
                                 "icon": "./assets/arrow-bend-up.svg",
                                 action: () => {
                                     let itemsToPlay = {}
@@ -272,7 +272,7 @@
                                 }
                             },
                             {
-                                name: app.getLz('action.playTracksLater'),
+                                name: `Play ${app.selectedMediaItems.length} tracks later`,
                                 "icon": "./assets/arrow-bend-down.svg",
                                 action: () => {
                                     let itemsToPlay = {}

src/renderer/views/components/queue.ejs

@@ -97,7 +97,7 @@
                     },
                     multiple: {
                         items: [{
-                            "name": app.getLz('action.removeTracks'),
+                            "name": `Remove ${self.selectedItems.length} tracks from queue`,
                             "action": function () {
                                 // add property to items to be removed
                                 self.selectedItems.forEach(function (item) {

src/web-remote/views/components/mediaitem-square.ejs

@@ -263,7 +263,7 @@
                     multiple: {
                         items: [
                             {
-                                name: app.getLz('action.playTracksNext'),
+                                name: `Play ${app.selectedMediaItems.length} tracks next`,
                                 "icon": "./assets/arrow-bend-up.svg",
                                 action: () => {
                                     let itemsToPlay = {}
@@ -285,7 +285,7 @@
                                 }
                             },
                             {
-                                name: app.getLz('action.playTracksLater'),
+                                name: `Play ${app.selectedMediaItems.length} tracks later`,
                                 "icon": "./assets/arrow-bend-down.svg",
                                 action: () => {
                                     let itemsToPlay = {}
@@ -312,7 +312,7 @@
                             {
                                 "icon": "./assets/feather/heart.svg",
                                 "id": "love",
-                                "name": app.getLz('action.love'),
+                                "name": "Love",
                                 "hidden": false,
                                 "disabled": true,
                                 "action": function () {
@@ -323,7 +323,7 @@
                                 "icon": "./assets/feather/heart.svg",
                                 "id": "unlove",
                                 "active": true,
-                                "name": app.getLz('action.unlove'),
+                                "name": "Unlove",
                                 "hidden": true,
                                 "action": function () {
                                     app.unlove(self.item)
@@ -332,7 +332,7 @@
                             {
                                 "icon": "./assets/feather/thumbs-down.svg",
                                 "id": "dislike",
-                                "name": app.getLz('action.dislike'),
+                                "name": "Dislike",
                                 "hidden": false,
                                 "disabled": true,
                                 "action": function () {
@@ -342,7 +342,7 @@
                             {
                                 "icon": "./assets/feather/thumbs-down.svg",
                                 "id": "undo_dislike",
-                                "name": app.getLz('action.undoDislike'),
+                                "name": "Undo dislike",
                                 "active": true,
                                 "hidden": true,
                                 "action": function () {
@@ -354,7 +354,7 @@
                             {
                                 "icon": "./assets/feather/list.svg",
                                 "id": "addToPlaylist",
-                                "name": app.getLz('action.addToPlaylist'),
+                                "name": "Add to Playlist...",
                                 "action": function () {
                                     app.promptAddToPlaylist()
                                 }
@@ -362,7 +362,7 @@
                             {
                                 "id": "addToLibrary",
                                 "icon": "./assets/feather/plus.svg",
-                                "name": app.getLz('action.addToLibrary'),
+                                "name": "Add to library",
                                 "hidden": false,
                                 "disabled": true,
                                 "action": function () {
@@ -375,7 +375,7 @@
                             {
                                 "id": "removeFromLibrary",
                                 "icon": "./assets/feather/x-circle.svg",
-                                "name": app.getLz('action.removeFromLibrary'),
+                                "name": "Remove from library",
                                 "hidden": true,
                                 "action": async function () {
                                     console.log("remove");
@@ -386,7 +386,7 @@
                                 }
                             },
                             {
-                                "name": app.getLz('action.playNext'),
+                                "name": "Play Next",
                                 "icon": "./assets/arrow-bend-up.svg",
                                 "action": function () {
                                     app.mk.playNext({[self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id})
@@ -395,7 +395,7 @@
                                 }
                             },
                             {
-                                "name": app.getLz('action.playLater'),
+                                "name": "Play Later",
                                 "icon": "./assets/arrow-bend-down.svg",
                                 "action": function () {
                                     app.mk.playLater({[self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id})
@@ -405,7 +405,7 @@
                             },
                             {
                                 "icon": "./assets/feather/share.svg",
-                                "name": app.getLz('action.share'),
+                                "name": "Share",
                                 "action": function () {
                                     self.app.copyToClipboard(self.item.attributes.url)
                                 }

src/web-remote/views/index.ejs

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <title>{{this.$root.getLz('remote.web.title')}}</title>
+    <title>Web Remote</title>
     <link rel="stylesheet" href="style.css?v=2">
     <script src="vue.js"></script>
     <script src="sortable.min.js"></script>
@@ -54,8 +54,8 @@
                       <h3>Quit Cider</h3>
                       <p>Are you sure you want to quit Cider?</p>
                       <div class="button-holder two-button">
-                        <a href="#" @click="quit()"> {{this.$root.getLz('dialog.ok')}}</a> 
+                        <a href="#" @click="quit()"> Yes</a> 
-                        <a href="#" @click="screen = 'player'">{{this.$root.getLz('dialog.cancel')}}</a>
+                        <a href="#" @click="screen = 'player'">Naah</a>
                         <div style="clear: both"></div>
                       </div>
                     </div>
@@ -111,7 +111,7 @@
                                 </template>
                             </template>
                             <template v-else>
-                                {{this.$root.getLz('term.noLyrics')}}
+                                No Lyrics Available
                             </template>
                         </div>
                         <div class="md-footer">
@@ -216,7 +216,7 @@
                                 :class="searchTypeClass('applemusic')" style="width:100%;">Apple Music
                             </button>
                             <button class="search-type-button" @click="search.searchType = 'library';searchQuery()"
-                                :class="searchTypeClass('library')" style="width:100%;">{{this.$root.getLz('term.library')}}
+                                :class="searchTypeClass('library')" style="width:100%;">Library
                             </button>
                         </div>
                         <div class="md-header search-tab-container" v-if="search.state == 2">
@@ -224,16 +224,16 @@
                                 Results
                             </button>
                             <button class="search-tab" @click="search.tab = 'songs'"
-                                :class="searchTabClass('songs')">{{this.$root.getLz('term.songs')}}
+                                :class="searchTabClass('songs')">Songs
                             </button>
                             <button class="search-tab" @click="search.tab = 'albums'"
-                                :class="searchTabClass('albums')">{{this.$root.getLz('term.albums')}}
+                                :class="searchTabClass('albums')">Albums
                             </button>
                             <button class="search-tab" @click="search.tab = 'artists'"
-                                :class="searchTabClass('artists')">{{this.$root.getLz('term.artists')}}
+                                :class="searchTabClass('artists')">Artists
                             </button>
                             <button class="search-tab" @click="search.tab = 'playlists'"
-                                :class="searchTabClass('playlists')">{{this.$root.getLz('term.playlists')}}
+                                :class="searchTabClass('playlists')">Playlists
                             </button>
                         </div>
                     </div>
@@ -243,7 +243,7 @@
                                 <div
                                     style="font-size: 17px;display:flex;flex-direction: column;justify-content: center;align-items: center;">
                                     <img src="./assets/search.svg" style="width: 40px;margin: 32px;opacity: 0.85">
-                                    {{this.$root.getLz('term.search')}}
+                                    Search by song, album, artist, or lyrics.
                                 </div>
                             </div>
                         </transition>
@@ -256,7 +256,7 @@
                             <div class="md-body search-body" ref="searchBody" @scroll="searchScroll"
                                 style="overflow-y:auto;" v-if="search.state == 2">
                                 <template v-if="canShowSearchTab('songs')">
-                                    <div class="list-entry-header">{{this.$root.getLz('term.songs')}}</div>
+                                    <div class="list-entry-header">Songs</div>
                                     <template v-if="search.results.songs != null">
                                         <div class="list-entry" v-for="song in search.results.songs.data"
                                             @click="trackSelect(song)">
@@ -389,7 +389,7 @@
                                     </template>
                                 </template>
                                 <template v-if="canShowSearchTab('playlists')">
-                                    <div class="list-entry-header">{{this.$root.getLz('term.playlists')}}</div>
+                                    <div class="list-entry-header">Playlists</div>
                                     <template v-if="search.results.playlists != null">
                                         <div class="list-entry" v-for="playlist in search.results.playlists.data"
                                             @click="showPlaylist(playlist.attributes.playParams.id)">
@@ -473,7 +473,7 @@
                             @click="playMediaItemById(search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
                             <div class="row">
                                 <div class="col">
-                                    {{this.$root.getLz('term.play')}}
+                                    Play
                                 </div>
                                 <div class="col-auto">
                                     ▶️
@@ -484,7 +484,7 @@
                             @click="playNext('song',search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
                             <div class="row">
                                 <div class="col">
-                                    {{this.$root.getLz('action.playNext')}}
+                                    Play Next
                                 </div>
                                 <div class="col-auto">
                                     ⏭️
@@ -495,7 +495,7 @@
                             @click="playLater('song', search.selected.attributes.playParams?.id ?? search.selected.id );clearSelectedTrack()">
                             <div class="row">
                                 <div class="col">
-                                    {{this.$root.getLz('action.playLater')}}
+                                    Play Later
                                 </div>
                                 <div class="col-auto">
                                     ⌛
@@ -528,7 +528,7 @@
                         <button class="context-menu-item context-menu-item--left" v-if="false">
                             <div class="row">
                                 <div class="col">
-                                    {{this.$root.getLz('action.addToLibrary')}}
+                                    Add To Library
                                 </div>
                                 <div class="col-auto">
                                     ➕
@@ -538,7 +538,7 @@
                         <button class="context-menu-item context-menu-item--left" v-if="false">
                             <div class="row">
                                 <div class="col">
-                                    {{this.$root.getLz('action.love')}}
+                                    Love
                                 </div>
                                 <div class="col-auto">
                                     ❤️
@@ -548,7 +548,7 @@
                         <button class="context-menu-item context-menu-item--left">
                             <div class="row">
                                 <div class="col">
-                                    {{this.$root.getLz('action.share')}}
+                                    Share
                                 </div>
                                 <div class="col-auto">
                                     🌐
@@ -594,14 +594,14 @@
                             <h2>{{ artistPage.data.attributes["name"] }}</h2>
                         </div>
                         <div class="md-body artist-body">
-                            <h2>{{this.$root.getLz('term.songs')}}</h2>
+                            <h2>Songs</h2>
                             <div class="song-scroller-horizontal">
                                 <button v-for="song in artistPage.data.relationships['songs'].data"
                                     class="song-placeholder" @click="trackSelect(song)">
                                     {{ song.attributes.name }}
                                 </button>
                             </div>
-                            <h2>{{this.$root.getLz('term.albums')}}</h2>
+                            <h2>Albums</h2>
                             <div class="mediaitem-scroller-horizontal">
                                 <div v-for="album in artistPage.data.relationships['albums'].data" @click="showAlbum(album.attributes.playParams.id)">
                                     <template v-if="album.attributes.artwork">
@@ -615,7 +615,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <h2>{{this.$root.getLz('term.playlists')}}</h2>
+                            <h2>Playlists</h2>
                             <div class="mediaitem-scroller-horizontal">
                                 <div v-for="playlist in artistPage.data.relationships['playlists'].data" @click="showPlaylist(playlist.attributes.playParams.id)">
                                     <template v-if="playlist.attributes.artwork">
@@ -743,7 +743,7 @@
                             </template>
                         </template>
                         <template v-else>
-                            {{this.$root.getLz('term.noLyrics')}}
+                            No Lyrics Available
                         </template>
                     </div>
                     <div class="md-footer">
@@ -789,12 +789,12 @@
                             <div class="row" style="margin-top: 20px;">
                                 <div class="col">
                                     <button class="wr-btn" @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, false)"
-                                        style="width:100%;">{{this.$root.getLz('term.play')}}
+                                        style="width:100%;">Play
                                     </button>
                                 </div>
                                 <div class="col">
                                     <button class="wr-btn" style="width:100%;"
-                                        @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, true)">{{this.$root.getLz('term.shuffle')}}
+                                        @click="playCustom(albumPage.data.attributes.playParams.id, albumPage.data.attributes.playParams.kind, true)">Shuffle
                                     </button>
                                 </div>
                             </div>
@@ -802,11 +802,11 @@
                                 <div class="notes-preview"
                                     v-html="albumPage.data.attributes['editorialNotes']['standard']">
                                 </div>
-                                <button @click="albumPage.editorsNotes = true" class="notes-more">{{this.$root.getLz('term.showMore')}}</button>
+                                <button @click="albumPage.editorsNotes = true" class="notes-more">More</button>
                             </div>
                         </div>
                         <div class="md-body artist-body">
-                            <div class="list-entry-header">{{this.$root.getLz('term.songs')}}</div>
+                            <div class="list-entry-header">Tracks</div>
                             <div class="list-entry" v-for="song in albumPage.data.relationships['tracks'].data"
                                 @click="trackSelect(song)">
                                 <div class="row">
@@ -826,7 +826,7 @@
                                 </div>
                             </div>
                             <div class="md-footer">
-                                <div>{{ albumPage.data.relationships['tracks'].data.length }} {{this.$root.getLz('term.tracks')}}</div>
+                                <div>{{ albumPage.data.relationships['tracks'].data.length }} Tracks</div>
                                 <div>
                                     {{ albumPage.data.attributes['copyright'] }}
                                 </div>
@@ -866,7 +866,7 @@
                         Loading...
                     </div>
                     <div v-else>
-                        <h3 style="text-align:center;">{{this.$root.getLz('error.connectionError')}}</h3>
+                        <h3 style="text-align:center;">Connection Interrupted</h3>
                         <!--<button class="md-btn md-btn-primary" style="font-weight:500;width: 120px;border-radius: 50px;display:block;margin: 0 auto;" @click="connect()">Retry-->
                         <button class="md-btn md-btn-primary"
                             style="font-weight:500;width: 120px;border-radius: 50px;display:block;margin: 0 auto;"