From d424f2cad59548173b5476f2b3253c0834f9012a Mon Sep 17 00:00:00 2001 From: memorydream <34763046+memorydream@users.noreply.github.com> Date: Mon, 11 Oct 2021 10:18:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=AD=8C=E5=90=8D?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E7=9A=84=E5=AE=9E=E7=8E=B0=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=B1=95=E7=A4=BA=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20(#958)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change song translate impl * i18n * 修改个变量名 * bug fix? --- src/components/TrackListItem.vue | 36 ++++++++++++++++++++++---------- src/locale/lang/en.js | 1 + src/locale/lang/tr.js | 1 + src/locale/lang/zh-CN.js | 1 + src/locale/lang/zh-TW.js | 1 + src/store/initLocalStorage.js | 1 + src/views/settings.vue | 29 +++++++++++++++++++++++++ 7 files changed, 59 insertions(+), 11 deletions(-) diff --git a/src/components/TrackListItem.vue b/src/components/TrackListItem.vue index fb572d8..302be50 100644 --- a/src/components/TrackListItem.vue +++ b/src/components/TrackListItem.vue @@ -43,8 +43,8 @@ - - ({{ translate }}) + + ({{ subTitle }})
@@ -124,11 +124,21 @@ export default { album() { return this.track.album || this.track.al || this.track?.simpleSong?.al; }, - translate() { - let t; - if (this.track?.tns?.length > 0) t = this.track.tns[0]; - else t = this.track.alia[0]; - return t; + subTitle() { + let tn = undefined; + if ( + this.track?.tns?.length > 0 && + this.track.name !== this.track.tns[0] + ) { + tn = this.track.tns[0]; + } + + //优先显示alia + if (this.$store.state.settings.subTitleDefault) { + return this.track?.alia?.length > 0 ? this.track.alia[0] : tn; + } else { + return tn === undefined ? this.track.alia[0] : tn; + } }, type() { return this.$parent.type; @@ -136,8 +146,12 @@ export default { isAlbum() { return this.type === 'album'; }, - isTranslate() { - return this.track?.tns?.length > 0 || this.track.alia?.length > 0; + isSubTitle() { + return ( + (this.track?.tns?.length > 0 && + this.track.name !== this.track.tns[0]) || + this.track.alia?.length > 0 + ); }, isPlaylist() { return this.type === 'playlist'; @@ -294,7 +308,7 @@ button { font-size: 14px; opacity: 0.72; } - .translate { + .subTitle { color: #aeaeae; margin-left: 4px; } @@ -398,7 +412,7 @@ button { .title, .album, .time, - .title-and-artist .translate { + .title-and-artist .subTitle { color: var(--color-primary); } .title .featured, diff --git a/src/locale/lang/en.js b/src/locale/lang/en.js index a97b675..4065e98 100644 --- a/src/locale/lang/en.js +++ b/src/locale/lang/en.js @@ -155,6 +155,7 @@ export default { enableDiscordRichPresence: 'Enable Discord Rich Presence', enableGlobalShortcut: 'Enable Global Shortcut', showLibraryDefault: 'Show library default', + subTitleDefault: 'Sub title alia default', lyricsBackground: { text: 'Show Lyrics Background', off: 'Off', diff --git a/src/locale/lang/tr.js b/src/locale/lang/tr.js index f9432bc..56d5e4d 100644 --- a/src/locale/lang/tr.js +++ b/src/locale/lang/tr.js @@ -150,6 +150,7 @@ export default { showPlaylistsByAppleMusic: "Apple Music'in Çalma Listelerini Göster", enableDiscordRichPresence: 'Discord gösterimini aktifleştir', showLibraryDefault: 'Kitaplık Varsayılanını göster', + subTitleDefault: 'Sub title alia default', lyricsBackground: { text: 'Şarkı Sözleri Arka Planını Göster', off: 'kapalı', diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js index dfcac60..99c0029 100644 --- a/src/locale/lang/zh-CN.js +++ b/src/locale/lang/zh-CN.js @@ -156,6 +156,7 @@ export default { enableDiscordRichPresence: '启用 Discord Rich Presence', enableGlobalShortcut: '启用全局快捷键', showLibraryDefault: '启动后显示音乐库', + subTitleDefault: '副标题使用别名', lyricsBackground: { text: '显示歌词背景', off: '关闭', diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js index d195b54..5e66d07 100644 --- a/src/locale/lang/zh-TW.js +++ b/src/locale/lang/zh-TW.js @@ -153,6 +153,7 @@ export default { enableDiscordRichPresence: '啟用 Discord Rich Presence', enableGlobalShortcut: '啟用全域快捷鍵', showLibraryDefault: '啟動後顯示音樂庫', + subTitleDefault: '副標題使用別名', lyricsBackground: { text: '顯示歌詞背景', off: '關閉', diff --git a/src/store/initLocalStorage.js b/src/store/initLocalStorage.js index 7e642a2..5fa494a 100644 --- a/src/store/initLocalStorage.js +++ b/src/store/initLocalStorage.js @@ -26,6 +26,7 @@ let localStorage = { enableDiscordRichPresence: false, enableGlobalShortcut: true, showLibraryDefault: false, + subTitleDefault: false, enabledPlaylistCategories, proxyConfig: { protocol: 'noProxy', diff --git a/src/views/settings.vue b/src/views/settings.vue index 6f484f5..1992348 100644 --- a/src/views/settings.vue +++ b/src/views/settings.vue @@ -337,6 +337,24 @@
+ +
+
+
{{ $t('settings.subTitleDefault') }}
+
+
+
+ + +
+
+
+
🐈️ 🏳️‍🌈
@@ -747,6 +765,17 @@ export default { }); }, }, + subTitleDefault: { + get() { + return this.settings.subTitleDefault; + }, + set(value) { + this.$store.commit('updateSettings', { + key: 'subTitleDefault', + value, + }); + }, + }, enableGlobalShortcut: { get() { return this.settings.enableGlobalShortcut;