diff --git a/src/i18n/README.md b/src/i18n/README.md index 8e42cc84..4246957d 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -291,7 +291,11 @@ Update 25/04/2022 00:21 UTC * `settings.description.settings`: Added for `en_US` * `settings.description.developer`: Added for `en_US` -Update 28/04/2022 21:30 UTC +Update 28/04/2022 21:45 UTC + +* `settings.option.general.resumetabs`: Added for `en_US` +* `settings.option.general.resumetabs.description`: Added for `en_US` +* `settings.option.general.resumetabs.dynamic`: Added for `en_US` +* `settings.option.general.resumetabs.dynamic.description`: Added for `en_US` -* `term.dynamic`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 2c21c987..78413968 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -73,7 +73,6 @@ "term.viewAs": "View As", "term.viewAs.coverArt": "Cover Art", "term.viewAs.list": "List", - "term.dynamic": "Dynamic", "term.size": "Size", "term.size.normal": "Normal", "term.size.compact": "Compact", @@ -273,6 +272,10 @@ "settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.", "settings.option.general.resumebehavior.history": "History", "settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.", + "settings.option.general.resumetabs" : "Open Tab on Launch", + "settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.", + "settings.option.general.resumetabs.dynamic" : "Dynamic", + "settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.", "settings.option.general.language.main": "Languages", "settings.option.general.language.fun": "Fun Languages", "settings.option.general.language.unsorted": "Unsorted", diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index 60f8761f..814ab20e 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -270,6 +270,10 @@ "settings.option.general.resumebehavior.locally.description": "A Cider az ezen az eszközön utoljára játszott zenét fogja folytatni.", "settings.option.general.resumebehavior.history": "Előzmények", "settings.option.general.resumebehavior.history.description": "A Cider az utolsó zeneszámot fogja lekérni az Apple Music előzményeidből, eszközökön keresztül.", + "settings.option.general.resumetabs" : "Fül megnyitása indításkor", + "settings.option.general.resumetabs.description" : "Itt tudod kiválasztani, hogy a Ciderbe való visszatérésnél melyik fül nyíljon meg.", + "settings.option.general.resumetabs.dynamic" : "Dinamikus", + "settings.option.general.resumetabs.dynamic.description" : "A Cider a legutóbb használt fület fogja megnyitni.", "settings.option.general.language.main": "Nyelvek", "settings.option.general.language.fun": "Fantázianyelvek", "settings.option.general.language.unsorted": "Kategorizálatlan", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 2c21c987..71d7a3d8 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -273,6 +273,10 @@ "settings.option.general.resumebehavior.locally.description": "Cider will resume your last session on this machine.", "settings.option.general.resumebehavior.history": "History", "settings.option.general.resumebehavior.history.description": "Cider will queue the last song from your overall Apple Music history, across devices.", + "settings.option.general.resumetabs" : "Open Tab on Launch", + "settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.", + "settings.option.general.resumetabs.dynamic" : "Dynamic", + "settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.", "settings.option.general.language.main": "Languages", "settings.option.general.language.fun": "Fun Languages", "settings.option.general.language.unsorted": "Unsorted", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 47aec291..59567017 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -45,7 +45,7 @@ export class Store { "enabled": false, "hidden": false, }, - "resumeWindow": { + "resumeTabs": { "tab": "home", "dynamicData": "" }, diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 7ae0e8a1..e05480a9 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -480,11 +480,11 @@ const app = new Vue({ app.modals[key] = false; } }, - restoreTabs() { - if (app.cfg.general.resumeWindow.tab == "dynamic") { - this.appRoute(app.cfg.general.resumeWindow.dynamicData) + resumeTabs() { + if (app.cfg.general.resumeTabs.tab == "dynamic") { + this.appRoute(app.cfg.general.resumeTabs.dynamicData) } else { - this.appRoute(app.cfg.general.resumeWindow.tab) + this.appRoute(app.cfg.general.resumeTabs.tab) } }, promptAddToPlaylist() { @@ -903,7 +903,7 @@ const app = new Vue({ this.appRoute(window.location.hash) } - this.restoreTabs() + this.resumeTabs() this.mediaKeyFixes() setTimeout(() => { @@ -1572,11 +1572,11 @@ const app = new Vue({ return; } route = route.replace(/#/g, "") - if (app.cfg.general.resumeWindow.tab == "dynamic") { + if (app.cfg.general.resumeTabs.tab == "dynamic") { if (route == "home" || route == "library-songs" || route == "library-albums" || route == "library-artists" || route == "library-videos" || route == "podcasts") { - app.cfg.general.resumeWindow.dynamicData = route + app.cfg.general.resumeTabs.dynamicData = route } else { - app.cfg.general.resumeWindow.dynamicData = "home" + app.cfg.general.resumeTabs.dynamicData = "home" } } // if the route contains does not include a / then route to the page directly diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 2da02c33..a5b44296 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -63,13 +63,15 @@
- Open Tab on Launch
+ {{$root.getLz('settings.option.general.resumetabs')}}
- ({{$root.getLz('settings.option.visual.hardwareAcceleration.description')}}) + {{$root.getLz('settings.option.general.resumetabs.description')}}
+ {{$root.getLz('settings.option.general.resumetabs.dynamic')}}: + {{$root.getLz('settings.option.general.resumetabs.dynamic.description')}}
- @@ -77,7 +79,7 @@ - +