From 1afbeb33fce24d373b4c50859edbccdb03224fa7 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 21:36:28 -0800 Subject: [PATCH 1/7] Fix setLzManual not called when lang changes after startup --- src/renderer/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/index.js b/src/renderer/index.js index 101452c2..c4027f12 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -344,6 +344,7 @@ const app = new Vue({ lang = this.cfg.general.language } this.lz = ipcRenderer.sendSync("get-i18n", lang) + setLzManual() }, getLz(message) { if(this.lz[message]) { From d4e2c4d301a632503a376aa6ffafcffbe75abc93 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 21:36:40 -0800 Subject: [PATCH 2/7] Fix 'reset' button not having text centered --- src/renderer/style.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/style.less b/src/renderer/style.less index eb7ce734..5f4d0127 100644 --- a/src/renderer/style.less +++ b/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; From 2861f21fcccb23238076f1bbba1d7edd84679d3a Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 21:52:05 -0800 Subject: [PATCH 3/7] Found one not i18n'd string --- src/renderer/views/pages/artist.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs index 860ef200..52d17e59 100644 --- a/src/renderer/views/pages/artist.ejs +++ b/src/renderer/views/pages/artist.ejs @@ -128,7 +128,7 @@ {{ data.attributes.bornOrFormed }}
-

Genre

+

{{app.getLz('term.sortBy.genre')}}

{{ data.attributes.genreNames.join(', ') }}
From 384269948652d1007db52c49362b792f6e948f52 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 21:52:48 -0800 Subject: [PATCH 4/7] minor grammar oversight --- src/renderer/views/pages/artist.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs index 52d17e59..3706d45e 100644 --- a/src/renderer/views/pages/artist.ejs +++ b/src/renderer/views/pages/artist.ejs @@ -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) } From a31c1493df9f09850276fb564f8b219fc095f305 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 22:44:12 -0800 Subject: [PATCH 5/7] Fixed setLz + duration string interpo --- src/i18n/en_US.jsonc | 6 ++++++ src/i18n/ja_JP.jsonc | 6 ++++++ src/i18n/zh_CN.jsonc | 6 ++++++ src/i18n/zh_TW.jsonc | 6 ++++++ src/renderer/index.js | 3 +-- src/renderer/views/pages/settings.ejs | 2 +- 6 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc index 5984199b..9935facb 100644 --- a/src/i18n/en_US.jsonc +++ b/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", diff --git a/src/i18n/ja_JP.jsonc b/src/i18n/ja_JP.jsonc index 5d8d5df1..5a8bbd55 100644 --- a/src/i18n/ja_JP.jsonc +++ b/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": "オーディオ空間化設定", diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index b58fa9b9..3452cfc8 100644 --- a/src/i18n/zh_CN.jsonc +++ b/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": "音频空间化设置", diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index 2079f12a..b5b23e5a 100644 --- a/src/i18n/zh_TW.jsonc +++ b/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": "音頻空間化設置", diff --git a/src/renderer/index.js b/src/renderer/index.js index c4027f12..0d62a776 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -344,7 +344,6 @@ const app = new Vue({ lang = this.cfg.general.language } this.lz = ipcRenderer.sendSync("get-i18n", lang) - setLzManual() }, getLz(message) { if(this.lz[message]) { @@ -1972,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 "" diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index fb80ac96..98b615cf 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -533,7 +533,7 @@ {{$root.getLz('term.language')}}
- From f280a50ee6f4e525563d0d357e534ba77449b9b5 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 22:57:50 -0800 Subject: [PATCH 6/7] fixed random newline for i18n in settings --- src/renderer/ameframework.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/ameframework.css b/src/renderer/ameframework.css index 7da9b6a2..38c56508 100644 --- a/src/renderer/ameframework.css +++ b/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) { From 5a7dfad3a4e5baf18f9460de23754d788d75690b Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Wed, 26 Jan 2022 22:59:54 -0800 Subject: [PATCH 7/7] totally did not just push to the wrong file --- src/web-remote/ciderframework.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/web-remote/ciderframework.css b/src/web-remote/ciderframework.css index b62db157..a84ea000 100644 --- a/src/web-remote/ciderframework.css +++ b/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 {