Merge pull request #230 from maikirakiwi/upcoming

Formatting + i18n

src/i18n/en_US.jsonc

@@ -91,6 +91,12 @@
   "term.time.added": "Added",
   "term.time.released": "Released", 
   "term.time.updated": "Updated",
+  "term.time.hours": "hours",
+  "term.time.hour": "hour",
+  "term.time.minutes": "minutes",
+  "term.time.minute": "minute",
+  "term.time.seconds": "seconds",
+  "term.time.second": "second",
   "term.fullscreenView": "Fullscreen View",
   "term.defaultView": "Default View",
   "term.spacializedAudioSetting": "Spacialized Audio Setting",

src/i18n/ja_JP.jsonc

@@ -90,6 +90,12 @@
   "term.time.added": "追加日",
   "term.time.released": "配信開始日", 
   "term.time.updated": "最終更新日",
+  "term.time.hours": "時間",
+  "term.time.hour": "時間",
+  "term.time.minutes": "分",
+  "term.time.minute": "分",
+  "term.time.seconds": "秒",
+  "term.time.second": "秒",
   "term.fullscreenView": "全画面表示",
   "term.defaultView": "ウィンドウ表示",
   "term.spacializedAudioSetting": "オーディオ空間化設定",

src/i18n/zh_CN.jsonc

@@ -90,6 +90,12 @@
   "term.time.added": "添加于",
   "term.time.released": "发行于", 
   "term.time.updated": "更新于",
+  "term.time.hours": "小时",
+  "term.time.hour": "小时",
+  "term.time.minutes": "分钟",
+  "term.time.minute": "分钟",
+  "term.time.seconds": "秒",
+  "term.time.second": "秒",
   "term.fullscreenView": "全屏",
   "term.defaultView": "默认",
   "term.spacializedAudioSetting": "音频空间化设置",

src/i18n/zh_TW.jsonc

@@ -90,6 +90,12 @@
   "term.time.added": "加入于",
   "term.time.released": "發行于", 
   "term.time.updated": "更改于",
+  "term.time.hours": "小時",
+  "term.time.hour": "小時",
+  "term.time.minutes": "分鐘",
+  "term.time.minute": "分鐘",
+  "term.time.seconds": "秒",
+  "term.time.second": "秒",
   "term.fullscreenView": "全螢幕顯示",
   "term.defaultView": "預設顯示",
   "term.spacializedAudioSetting": "音頻空間化設置",

src/renderer/ameframework.css

@@ -27,6 +27,7 @@
 
 .md-option-segment.md-option-segment_auto {
     width: auto;
+    white-space: nowrap;
 }
 
 .md-option-container .md-option-line:not(:last-child) {

src/renderer/index.js

@@ -1971,7 +1971,7 @@ const app = new Vue({
                     let hours = Math.floor(time / 3600)
                     let mins = Math.floor(time / 60) % 60
                     let secs = time % 60
-                    return app.showingPlaylist.relationships.tracks.data.length + " track" + (app.showingPlaylist.relationships.tracks.data.length > 1 ? "s" : "") + ", " + ((hours > 0) ? (hours + (" hour" + ((hours > 1) ? "s, " : ", "))) : "") + ((mins > 0) ? (mins + (" minute" + ((mins > 1) ? "s, " : ", "))) : "") + secs + (" second" + ((secs > 1) ? "s." : "."));
+                    return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.tracks') +", " + ((hours > 0) ? (hours + (" " + ((hours > 1) ? app.getLz('term.time.hours') + ", " : app.getLz('term.time.hour') +", "))) : "") + ((mins > 0) ? (mins + ((mins > 1) ? " " + app.getLz('term.time.minutes') + ", " : " " + app.getLz('term.time.minute') + ", ")) : "") + secs + ((secs > 1) ? " " + app.getLz('term.time.seconds') + "." : " " +  app.getLz('term.time.second') + ".");
                 } else return ""
             } catch (err) {
                 return ""

src/renderer/style.less

@@ -5773,6 +5773,7 @@ body.no-gpu {
       .reset-button{
         width: 50%;
         margin-left: 25%;
+        text-align: center;
       }
       input.eq-slider {
         -webkit-appearance: slider-vertical;

src/renderer/views/pages/artist.ejs

@@ -128,7 +128,7 @@
                                 {{ data.attributes.bornOrFormed }}
                             </div>
                             <div v-if="data.attributes.genreNames">
-                                <h3>Genre</h3>
+                                <h3>{{app.getLz('term.sortBy.genre')}}</h3>
                                 {{ data.attributes.genreNames.join(', ') }}
                             </div>
                         </div>
@@ -192,7 +192,7 @@
                         followActions[followAction],
                         {
                             icon: "./assets/feather/share.svg",
-                            name: app.getLz('action.share'),
+                            name: app.getLz('term.share'),
                             action: ()=>{
                                 self.app.copyToClipboard(self.data.attributes.url)
                             }

src/renderer/views/pages/settings.ejs

@@ -533,7 +533,7 @@
                     {{$root.getLz('term.language')}}
                 </div>
                 <div class="md-option-segment md-option-segment_auto">
-                    <select class="md-select" @change="$root.setLz('')" v-model="app.cfg.general.language">
+                    <select class="md-select" @change="$root.setLz('');$root.setLzManual()" v-model="app.cfg.general.language">
                         <optgroup :label="index" v-for="(categories, index) in getLanguages()">
                             <option v-for="lang in categories" :value="lang.code">{{lang.nameNative}} ({{ lang.nameEnglish }})</option>
                         </optgroup>

src/web-remote/ciderframework.css

@@ -22,6 +22,7 @@
 
 .md-option-segment.md-option-segment_auto {
     width: auto;
+    white-space: nowrap;
 }
 
 .md-option-container .md-option-line:not(:last-child) {
@@ -102,6 +103,7 @@ input[type=range].md-slider::-webkit-slider-runnable-track {
     font-size: 15px;
     border: 1px solid rgb(100 100 100 / 35%);
     box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.4);
+    white-space: nowrap;
 }
 
 .md-btn.md-btn-block {