From 6141a33037afca6193c0a216214c729451a54d42 Mon Sep 17 00:00:00 2001 From: Bill Zhang <1158817754@qq.com> Date: Tue, 15 Feb 2022 02:41:41 +0800 Subject: [PATCH 1/5] Update zh_CN.jsonc (#451) --- src/i18n/zh_CN.jsonc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc index 730132fb..080b584a 100644 --- a/src/i18n/zh_CN.jsonc +++ b/src/i18n/zh_CN.jsonc @@ -34,6 +34,7 @@ "term.about": "关于", "term.privateSession": "私人聆听", "term.queue": "队列", + "term.history": "播放历史", "term.search": "搜索", "term.library": "资料库", "term.listenNow": "现在就听", @@ -111,13 +112,15 @@ "term.clearAll": "清空", "term.recentStations": "最近播放的频道", "term.language": "语言", - "term.noLyrics": "加载中... / 搜索无结果 / 纯音乐", + "term.funLanguages": "恶搞", + "term.noLyrics": "加载中... / 无搜索结果 / 纯音乐", "term.copyright": "版权所有", "term.rightsReserved": "保留所有权利。", "term.sponsor": "赞助", "term.ciderTeam": "Cider 团队", "term.developer": "开发者", "term.socialTeam": "媒体团队", + "term.socials": "媒体", "term.contributors": "贡献者", "term.equalizer": "均衡器", "term.reset": "重置", @@ -137,7 +140,7 @@ "term.defaultPresets": "默认预设", "term.userPresets": "用户预设", "term.requestError": "请求出现一个问题。", - "term.song.link.generate": "获取 song.link 共享URL...", + "term.song.link.generate": "获取 song.link 共享链接...", "term.musicVideos": "音乐视频", // Search page friendlyTypes "term.stations": "电台", //"term.curators": "Curators", @@ -147,6 +150,8 @@ "term.videoExtras": "视频特辑", //"term.top": "Top", "term.version": "版本", + + // Home "home.title": "主页", @@ -186,6 +191,7 @@ "action.removeFromQueue": "从加入待播清单中移除", "action.removeFromQueue.success": "已从加入待播清单中移除", "action.removeFromQueue.error": "从加入待播清单中移除的过程发生了错误", + "action.createPlaylist": "新建播放列表", "action.addToPlaylist": "加入播放列表", "action.removeFromPlaylist": "从播放列表中移除", "action.addToFavorites": "加至收藏", @@ -221,7 +227,7 @@ "action.copy": "复制", "action.newpreset": "新建预设...", // Equalizer Preset "action.deletepreset": "删除预设", - + // Settings - General "settings.header.general": "通用", "settings.header.general.description": "调整 Cider 的通用设置", @@ -257,6 +263,8 @@ "settings.option.audio.enableAdvancedFunctionality.description": "启用 AudioContext 将解锁例如音量标准化和音频空间化的功能，但可能会在小部分设备上出现音频上的卡顿。", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 数字增强引擎™️", // Toggle "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "将欺骗您的大脑来感知到近似无损音频的效果。", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "数字增强引擎强度", // Toggle + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "改变音频处理的强度。(激进选项可能产生杂音)", "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音量标准化", // Toggle "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "使所感知到的音频响度统一", "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音频空间化", // Toggle @@ -265,7 +273,7 @@ "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "激进", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "空间音频与数字增强引擎不兼容，请先停用数字增强引擎", - + // Settings - Visual "settings.header.visual": "外观", "settings.header.visual.description": "调整 Cider 的外观", @@ -290,6 +298,8 @@ "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", "settings.header.visual.theme": "主题", "settings.option.visual.theme.github.download": "通过GitHub URL安装", + "settings.option.visual.theme.github.explore": "浏览 GitHub 上的主题", + "settings.option.visual.theme.github.install.confirm": "确定要安装 {{ repo }}?", "settings.prompt.visual.theme.github.URL": "请输入欲安装主题的URL", "settings.notyf.visual.theme.install.success": "主题安装成功", "settings.notyf.visual.theme.install.error": "主题安装失败", From 3af828aa0e43e457071401966335d7046201bd33 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 14 Feb 2022 11:54:08 -0800 Subject: [PATCH 2/5] might as well as hide the option --- src/renderer/views/pages/settings.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 70ca7ac2..8adc40aa 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -61,7 +61,7 @@ switch/> -
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
@@ -107,7 +107,7 @@ switch/>
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}
From 67f7af2ca51da335331409f8213f2e0cd55cd362 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Mon, 14 Feb 2022 11:57:23 -0800 Subject: [PATCH 3/5] well okay instead of hiding it and have people complain might as well as only disabling the switch --- src/renderer/views/pages/settings.ejs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 8adc40aa..ae4101b5 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -61,14 +61,14 @@ switch/>
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')}}
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE.description')}}
- +
@@ -107,14 +107,14 @@ switch/>
-
+
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization')}}
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description')}}
- +
From 3a7b5d865533ed67b54808c4d3e38290f60f8833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?= <46503943+jay900604@users.noreply.github.com> Date: Tue, 15 Feb 2022 13:13:13 +0800 Subject: [PATCH 4/5] Update zh_TW.jsonc (#454) Update the TW language of GitHub Themes. --- src/i18n/zh_TW.jsonc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc index d92e0b35..b373c6f7 100644 --- a/src/i18n/zh_TW.jsonc +++ b/src/i18n/zh_TW.jsonc @@ -276,6 +276,7 @@ "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", "settings.header.visual.theme": "主題", "settings.option.visual.theme.github.download" : "從 GitHub 網址安裝" , + "settings.option.visual.theme.github.explore": "瀏覽 GitHub 上的主題", "settings.prompt.visual.theme.github.URL" : "輸入你要安裝的主題網址" , "settings.notyf.visual.theme.install.success" : "主題成功安裝" , "settings.notyf.visual.theme.install.error" : "主題安裝失敗" , From 237d20ff6dd4b1e68097954afb80dadc233067d9 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Mon, 14 Feb 2022 22:08:24 -0800 Subject: [PATCH 5/5] Added update check if using MSS or MAS builds. need help implementing --- src/main/base/browserwindow.ts | 9 +++++++++ src/renderer/views/pages/settings.ejs | 13 +++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 0cd560ee..cbe6547d 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -672,6 +672,15 @@ export class BrowserWindow { await win_autoUpdater.checkForUpdatesAndNotify() await linux_autoUpdater.checkForUpdatesAndNotify() }); + ipcMain.on('disable-update', (event) => { + // Check if using app store builds so people don't get pissy wen button go bonk + if (app.isPackaged && !process.mas || !process.windowsStore) { + event.returnValue = false + } else { + event.returnValue = true + } + }) + ipcMain.on('share-menu', async (_event, url) => { if (process.platform != 'darwin') return; diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index ae4101b5..23292ff0 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -656,7 +656,7 @@
-
+
{{$root.getLz('settings.option.general.updateCider')}}
@@ -666,7 +666,7 @@
-
+
{{$root.getLz('settings.option.general.updateCider.branch')}}
({{$root.getLz('settings.option.general.updateCider.branch.description')}}) @@ -852,6 +852,15 @@ ipcRenderer.invoke('setStoreValue', 'general.close_behavior', app.cfg.general.close_behavior); // setStoreValue does not change plugin store values somehow ipcRenderer.invoke('update-store-mtt', app.cfg.general.close_behavior); + }, + checkIfUpdateDisabled() { + if (ipcRenderer.sendSync('disable-update')) { + let updateFields = document.getElementsByClassName('update-check'); + for (var i=0; i < updateFields.length; i++) { + updateFields[i].style = "opacity: 0.5; pointer-events: none;"; + updateFields[i].title = "Not available on this type of build"; + } + } } } })