Merge pull request #961 from mefsaal/develop

No more HardCoded Strings

src/i18n/README.md

@@ -297,6 +297,45 @@ Update 28/04/2022 21:45 UTC
 * `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`
+
+Update 29/04/2022 00:00 UTC
+
+ * `menubar.options.about`: Added for `en_US`
+ * `menubar.options.settings`: Added for `en_US`
+ * `menubar.options.quit`: Added for `en_US`
+ * `menubar.options.view`: Added for `en_US`
+ * `menubar.options.reload`: Added for `en_US`
+ * `menubar.options.forcereload`: Added for `en_US`
+ * `menubar.options.toggledevtools`: Added for `en_US`
+ * `menubar.options.window`: Added for `en_US`
+ * `menubar.options.minimize`: Added for `en_US`
+ * `menubar.options.toggleprivate`: Added for `en_US`
+ * `menubar.options.webremote`: Added for `en_US`
+ * `menubar.options.audio`: Added for `en_US`
+ * `menubar.options.plugins`: Added for `en_US`
+ * `menubar.options.control`: Added for `en_US`
+ * `menubar.options.next`: "Added for `en_US`
+ * `menubar.options.previous`: Added for `en_US`
+ * `menubar.options.volumeup`: Added for `en_US`
+ * `menubar.options.volumedown`: Added for `en_US`
+ * `menubar.options.browse`: Added for `en_US`
+ * `menubar.options.artists`: Added for `en_US`
+ * `menubar.options.search`: Added for `en_US`
+ * `menubar.options.albums`: Added for `en_US`
+ * `menubar.options.cast`: Added for `en_US`
+ * `menubar.options.account`: Added for `en_US`
+ * `menubar.options.accountsettings`: Added for `en_US`
+ * `menubar.options.signout`: Added for `en_US`
+ * `menubar.options.support`: Added for `en_US`
+ * `menubar.options.discord`: Added for `en_US`
+ * `menubar.options.github`: Added for `en_US`
+ * `menubar.options.report`: Added for `en_US`
+ * `menubar.options.bug`: Added for `en_US`
+ * `menubar.options.feature`: Added for `en_US`
+ * `menubar.options.trans`: Added for `en_US`
+ * `menubar.options.license`: Added for `en_US`
+ * `menubar.options.conf`: Added for `en_US` 
 
 Update 07/05/2022 04:00 UTC
 * `term.personalStations`: Added for `en_US`

src/i18n/en_US.json

@@ -266,6 +266,42 @@
   "action.cast.scanning": "Scanning...",
   "action.createNew": "Create New...",
   "action.openArtworkInBrowser": "Open artwork in browser",
+  "menubar.options.about": "About",
+  "menubar.options.settings": "Settings",
+  "menubar.options.quit": "Quit Cider",
+  "menubar.options.view": "View ",
+  "menubar.options.reload": "Reload",
+  "menubar.options.forcereload": "Force Reload",
+  "menubar.options.toggledevtools": "Toggle Developer Tools",
+  "menubar.options.window": "Window",
+  "menubar.options.minimize": "Minimize",
+  "menubar.options.toggleprivate": "Toggle Private Session",
+  "menubar.options.webremote": "Web Remote",
+  "menubar.options.audio": "Audio Settings",
+  "menubar.options.plugins": "Plu-gins Menu",
+  "menubar.options.controls": "Controls",
+  "menubar.options.next": "Next",
+  "menubar.options.playpause": "Play/Pause",
+  "menubar.options.previous": "Previous",
+  "menubar.options.volumeup": "Volume Up",
+  "menubar.options.volumedown": "Volume Down",
+  "menubar.options.browse": "Browse",
+  "menubar.options.artists": "Artists",
+  "menubar.options.search": "Search",
+  "menubar.options.albums": "Albums",
+  "menubar.options.cast": "Cast To Devices",
+  "menubar.options.account": "Account",
+  "menubar.options.accountsettings": "Account Settings",
+  "menubar.options.signout": "Sign Out",
+  "menubar.options.support": "Support",
+  "menubar.options.discord": "Discord",
+  "menubar.options.github": "GitHub Wiki",
+  "menubar.options.report": "Report a...",
+  "menubar.options.bug": "Bug",
+  "menubar.options.feature": "Feature Request",
+  "menubar.options.trans": "Translation Report/Request",
+  "menubar.options.license": "View License",
+  "menubar.options.conf": "Open Configuration File in Editor",
   "settings.header.general": "General",
   "settings.header.general.description": "Adjust the general settings for Cider.",
   "settings.option.general.language": "Language",

src/i18n/es_ES.json

@@ -73,6 +73,7 @@
   "term.viewAs": "Ver como",
   "term.viewAs.coverArt": "Portada",
   "term.viewAs.list": "Lista",
+  "term.dynamic": "Dinámico",
   "term.size": "Tamaño",
   "term.size.normal": "Normal",
   "term.size.compact": "Compacto",
@@ -199,6 +200,9 @@
   "podcast.episodes": "Episodios",
   "podcast.playEpisode": "Reproducir Episodio",
   "podcast.website": "Sitio web de Podcasts",
+  "action.edit": "Editar",
+  "action.done": "Hecho",
+  "action.editTracklist": "Edit Tracklist",
   "action.addToLibrary": "Agregar a la Biblioteca",
   "action.addToLibrary.success": "Agregado a la Biblioteca",
   "action.addToLibrary.error": "Error al agregar a la Biblioteca",
@@ -260,6 +264,42 @@
   "action.cast.scanning": "Escaneando...",
   "action.createNew": "Crear Nuevo...",
   "action.openArtworkInBrowser": "Abrir Ilustración en el navegador",
+  "menubar.options.about": "Acerca de",
+  "menubar.options.settings": "Ajustes",
+  "menubar.options.quit": "Salir",
+  "menubar.options.view": "Ver",
+  "menubar.options.reload": "Recargar",
+  "menubar.options.forcereload": "Forzar Recarga",
+  "menubar.options.toggledevtools": "Herramientas de Desarrollo",
+  "menubar.options.window": "Ventana",
+  "menubar.options.minimize": "Minimizar",
+  "menubar.options.toggleprivate": "Cambiar Sesión Privada",
+  "menubar.options.webremote": "Web Remoto",
+  "menubar.options.audio": "Configuraciones de Audio",
+  "menubar.options.plugins": "Menu de Plu-gins",
+  "menubar.options.controls": "Controles",
+  "menubar.options.next": "Siguiente",
+  "menubar.options.playpause": "Reproducir/Pausar",
+  "menubar.options.previous": "Anterior",
+  "menubar.options.volumeup": "Subir Volumen",
+  "menubar.options.volumedown": "Bajar Volumen",
+  "menubar.options.browse": "Explorar",
+  "menubar.options.artists": "Artistas",
+  "menubar.options.search": "Buscar",
+  "menubar.options.albums": "Álbumes",
+  "menubar.options.cast": "Transmitir a Dispositivos",
+  "menubar.options.account": "Cuenta",
+  "menubar.options.accountsettings": "Ajustes de Cuenta",
+  "menubar.options.signout": "Cerrar Sesión",
+  "menubar.options.support": "Soporte",
+  "menubar.options.discord": "Discord",
+  "menubar.options.github": "GitHub Wiki",
+  "menubar.options.report": "Reportar a...",
+  "menubar.options.bug": "Bug",
+  "menubar.options.feature": "Solicitud de características",
+  "menubar.options.trans": "Solicitud de Informe/Traducción",
+  "menubar.options.license": "Ver licencia",
+  "menubar.options.conf": "Abrir archivo de configuración en el editor",
   "settings.header.general": "General",
   "settings.header.general.description": "Ajuste la configuración general de Cider.",
   "settings.option.general.language": "Idioma",
@@ -269,6 +309,10 @@
   "settings.option.general.resumebehavior.locally.description": "Cider reanudará su última sesión en esta PC.",
   "settings.option.general.resumebehavior.history": "Histórico",
   "settings.option.general.resumebehavior.history.description": "Cider pondrá en cola la última canción de su historial general de Apple Music, en todos sus dispositivos.",
+  "settings.option.general.resumetabs" : "Abrir pestaña al iniciar",
+  "settings.option.general.resumetabs.description" : "Puede elegir qué pestaña desea abrir cuando inicie Cider.",
+  "settings.option.general.resumetabs.dynamic" : "Dinámico",
+  "settings.option.general.resumetabs.dynamic.description" : "Cider abrirá la pestaña que utilizó por última vez.",
   "settings.option.general.language.main": "Idiomas",
   "settings.option.general.language.fun": "Idiomas Fun (Parodias)",
   "settings.option.general.language.unsorted": "Sin Clasificar",
@@ -280,6 +324,8 @@
   "settings.option.general.customizeSidebar": "Personalizar elementos de la barra lateral",
   "settings.option.general.customizeSidebar.customize": "Personalizar",
   "settings.option.general.keybindings": "Combinaciones de Teclas",
+  "settings.notyf.general.keybindings.update.success": "Combinación de teclas actualizada correctamente",
+  "settings.prompt.general.keybindings.update.success": "La combinación de teclas se actualizó correctamente. Pulsa OK para reiniciar Cider",
   "settings.option.general.keybindings.open": "Abrir",
   "settings.description.search": "Buscar",
   "settings.description.albums": "Álbumes de la biblioteca",
@@ -410,6 +456,7 @@
   "settings.option.lyrics.enableMusixmatchKaraoke": "Habilitar el modo Karaoke (solo Musixmatch)",
   "settings.option.lyrics.musixmatchPreferredLanguage": "Idioma preferido de traducción de Musixmatch",
   "settings.option.lyrics.enableYoutubeLyrics": "Habilitar letras de YouTube para videos musicales",
+  "settings.option.lyrics.enableQQLyrics": "Habilitar letras de QQ",
   "settings.header.connectivity": "Conectividad",
   "settings.header.connectivity.description": "Ajuste la configuración de conectividad para Cider.",
   "settings.option.connectivity.playbackNotifications": "Notificaciones de Reproducción",
@@ -442,7 +489,9 @@
   "settings.option.visual.transparent.description": "Marco transparente (necesita compatibilidad con temas, requiere reiniciar)",
   "settings.header.advanced": "Avanzado",
   "settings.header.connect": "Conectar",
-  "spatial.notTurnedOn": "La espacialización de audio está deshabilitada. Para usar, habilítelo primero.",
+  "settings.option.connect.link_account": "Habilitar sincronización con Cider Connect",
+  "settings.option.connect.link_account.description": "Vincular su cuenta de Discord con Cider Connect le permite almacenar datos de usuario que incluyen configuraciones, ecualizadores y eventualmente más, una vez que haya terminado. (Trabajo en progreso)",
+  "spatial.notTurnedOn": "La Espacialización de audio está deshabilitada. Para usar, habilítelo primero.",
   "spatial.spatialProperties": "Propiedades de Espacialización",
   "spatial.width": "Ancho",
   "spatial.height": "Alto",

src/i18n/source/en_US.json

@@ -266,6 +266,42 @@
   "action.cast.scanning": "Scanning...",
   "action.createNew": "Create New...",
   "action.openArtworkInBrowser": "Open artwork in browser",
+  "menubar.options.about": "About",
+  "menubar.options.settings": "Settings",
+  "menubar.options.quit": "Quit Cider",
+  "menubar.options.view": "View ",
+  "menubar.options.reload": "Reload",
+  "menubar.options.forcereload": "Force Reload",
+  "menubar.options.toggledevtools": "Toggle Developer Tools",
+  "menubar.options.window": "Window",
+  "menubar.options.minimize": "Minimize",
+  "menubar.options.toggleprivate": "Toggle Private Session",
+  "menubar.options.webremote": "Web Remote",
+  "menubar.options.audio": "Audio Settings",
+  "menubar.options.plugins": "Plu-gins Menu",
+  "menubar.options.controls": "Controls",
+  "menubar.options.next": "Next",
+  "menubar.options.playpause": "Play/Pause",
+  "menubar.options.previous": "Previous",
+  "menubar.options.volumeup": "Volume Up",
+  "menubar.options.volumedown": "Volume Down",
+  "menubar.options.browse": "Browse",
+  "menubar.options.artists": "Artists",
+  "menubar.options.search": "Search",
+  "menubar.options.albums": "Albums",
+  "menubar.options.cast": "Cast To Devices",
+  "menubar.options.account": "Account",
+  "menubar.options.accountsettings": "Account Settings",
+  "menubar.options.signout": "Sign Out",
+  "menubar.options.support": "Support",
+  "menubar.options.discord": "Discord",
+  "menubar.options.github": "GitHub Wiki",
+  "menubar.options.report": "Report a...",
+  "menubar.options.bug": "Bug",
+  "menubar.options.feature": "Feature Request",
+  "menubar.options.trans": "Translation Report/Request",
+  "menubar.options.license": "View License",
+  "menubar.options.conf": "Open Configuration File in Editor",
   "settings.header.general": "General",
   "settings.header.general.description": "Adjust the general settings for Cider.",
   "settings.option.general.language": "Language",

src/main/plugins/menubar.ts

@@ -3,6 +3,7 @@ import {utils} from "../base/utils";
 
 export default class Thumbar {
 
+
     /**
      * Base Plugin Details (Eventually implemented into a GUI in settings)
      */
@@ -22,30 +23,36 @@ export default class Thumbar {
             label: app.getName(),
             submenu: [
                 {
-                    label: 'About',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Settings',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'),
                     accelerator: utils.getStoreValue("general.keybindings.settings").join('+'),
-                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`)
+                    click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`),
                 },
+                ...(this.isMac ? [
                 {type: 'separator'},
                 {role: 'services'},
                 {type: 'separator'},
                 {role: 'hide'},
                 {role: 'hideOthers'},
                 {role: 'unhide'},
+            ]: [
                 {type: 'separator'},
-                {role: 'quit'}
+                {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')},
-            ]
+            ]),
+            ],  
         },
+
+
         {
-            label: 'View',
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'),
             submenu: [
-                {role: 'reload'},
+                {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')},
-                {role: 'forceReload'},
+                {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')},
+                ...(this.isMac ? [
                 {role: 'toggleDevTools'},
                 {type: 'separator'},
                 {role: 'resetZoom'},
@@ -53,24 +60,27 @@ export default class Thumbar {
                 {role: 'zoomOut'},
                 {type: 'separator'},
                 {role: 'togglefullscreen'},
-            ]
+            
+        ]: []),
+        ],
         },
         {
-            label: 'Window',
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'),
             submenu: [
-                {role: 'minimize'},
+                {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')},
+                ...(this.isMac ? [
                 {
                     label: 'Show',
                     click: () => utils.getWindow().show()
                 },
                 {role: 'zoom'},
-                ...(this.isMac ? [
+                
                     {type: 'separator'},
                     {role: 'front'},
                     {role: 'close'},
-                ] : [
+                 
                     {role: 'close'},
-                ]),
+
                 
                 {
                     label: 'Edit',
@@ -83,146 +93,148 @@ export default class Thumbar {
                         {role: 'paste'},
                     ]
                 },
+            ] : []
+            ),               
                 {type: 'separator'},
                 {
-                    label: 'Toggle Private Session',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'),
                     accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Web Remote',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.webremote'),
                     accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'),
                     sublabel: 'Opens in external window',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`)
                 },
                 {
-                    label: 'Audio Settings',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.audio'),
                     accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`)
                 },
                 {
-                    label: 'Plug-in Menu',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.plugins'),
                     accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`)
                 }
             ]
         },
         {
-            label: 'Controls',
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.controls'),
             submenu: [
                 {
-                    label: 'Pause / Play',
+                    label:  utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.playpause'),
                     accelerator: 'Space',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`)
                 },
                 {
-                    label: 'Next',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.next'),
                     accelerator: 'CommandOrControl+Right',
                     click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`)
                 },
                 {
-                    label: 'Previous',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.previous'),
                     accelerator: 'CommandOrControl+Left',
                     click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Volume Up',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumeup'),
                     accelerator: 'CommandOrControl+Up',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`)
                 },
                 {
-                    label: 'Volume Down',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumedown'),
                     accelerator: 'CommandOrControl+Down',
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`)
                 },
                 {
-                    label: 'Browse',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.browse'),
                     accelerator: utils.getStoreValue("general.keybindings.browse").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Artists',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.artists'),
                     accelerator: utils.getStoreValue("general.keybindings.artists").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`)
                 },
                 {
-                    label: 'Search',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'),
                     accelerator: utils.getStoreValue("general.keybindings.search").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Album',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.albums'),
                     accelerator: utils.getStoreValue("general.keybindings.albums").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Cast To Devices',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cast'),
                     accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`)
                 }
             ]
         },
         {
-            label: 'Account',
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.account'),
             submenu: [
                 {
-                    label: 'Account Settings',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.accountsettings'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`)
                 },
                 {
-                    label: 'Sign Out',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.signout'),
                     click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`)
                 }
             ]
         },
         {
-            label: 'Support',
+            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'),
             role: 'help',
             submenu: [
                 {
-                    label: 'Discord',
+                    label: utils.getLocale('Discord', 'menubar.options.discord'),
                     click: () => shell.openExternal("https://discord.gg/AppleMusic").catch(console.error)
                 },
                 {
-                    label: 'GitHub Wiki',
+                    label: utils.getLocale('GitHub Wiki', 'menubar.options.github'),
                     click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Report a...',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.report'),
                     submenu: [
                         {
-                            label: 'Bug',
+                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.bug'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error)
                         },
                         {
-                            label: 'Feature Request',
+                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.feature'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error)
                         },
                         {
-                            label: 'Translation Report/Request',
+                            label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.trans'),
                             click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error)
                         },
                     ]
                 },
                 {type: 'separator'},
                 {
-                    label: 'View License',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.license'),
                     click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error)
                 },
                 {type: 'separator'},
                 {
-                    label: 'Toggle Developer Tools',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools'),
                     accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'),
                     click: () => utils.getWindow().webContents.openDevTools()
                 },
                 {
-                    label: 'Open Configuration File in Editor',
+                    label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.conf'),
                     click: () => utils.getStoreInstance().openInEditor()
                 }
             ]