diff --git a/wowup-electron/src/app/app.component.ts b/wowup-electron/src/app/app.component.ts index 0b874ceb..ff24a098 100644 --- a/wowup-electron/src/app/app.component.ts +++ b/wowup-electron/src/app/app.component.ts @@ -38,9 +38,21 @@ export class AppComponent implements AfterViewInit { private _dialog: MatDialog, private _addonService: AddonService ) { + this.translate.addLangs([ + "en", + "de", + "es", + "fr", + "it", + "ko", + "nb", + "pt", + "ru", + "zh", + ]); this.translate.setDefaultLang("en"); - this.translate.use(this._electronService.locale); + this.translate.use(this._wowUpService.setCurrentLanguage); } ngAfterViewInit(): void { diff --git a/wowup-electron/src/app/components/options-app-section/options-app-section.component.html b/wowup-electron/src/app/components/options-app-section/options-app-section.component.html index 079391b1..e350c604 100644 --- a/wowup-electron/src/app/components/options-app-section/options-app-section.component.html +++ b/wowup-electron/src/app/components/options-app-section/options-app-section.component.html @@ -6,20 +6,35 @@
-
{{ "PAGES.OPTIONS.APPLICATION.TELEMETRY_LABEL" | translate }}
+
+ {{ "PAGES.OPTIONS.APPLICATION.TELEMETRY_LABEL" | translate }} +
- +
- {{ "PAGES.OPTIONS.APPLICATION.TELEMETRY_DESCRIPTION" | translate }} + + {{ "PAGES.OPTIONS.APPLICATION.TELEMETRY_DESCRIPTION" | translate }} +
-
{{ "PAGES.OPTIONS.APPLICATION.MINIMIZE_ON_CLOSE_LABEL" | translate }}
+
+ {{ "PAGES.OPTIONS.APPLICATION.MINIMIZE_ON_CLOSE_LABEL" | translate }} +
- +
{{ minimizeOnCloseDescription }} @@ -28,39 +43,76 @@
-
{{ "PAGES.OPTIONS.APPLICATION.ENABLE_SYSTEM_NOTIFICATIONS_LABEL" | translate }}
+
+ {{ + "PAGES.OPTIONS.APPLICATION.ENABLE_SYSTEM_NOTIFICATIONS_LABEL" + | translate + }} +
- +
- {{ "PAGES.OPTIONS.APPLICATION.ENABLE_SYSTEM_NOTIFICATIONS_DESCRIPTION" | translate }} + {{ + "PAGES.OPTIONS.APPLICATION.ENABLE_SYSTEM_NOTIFICATIONS_DESCRIPTION" + | translate + }}
-
{{ "PAGES.OPTIONS.APPLICATION.USE_HARDWARE_ACCELERATION_LABEL" | translate }}
+
+ {{ + "PAGES.OPTIONS.APPLICATION.USE_HARDWARE_ACCELERATION_LABEL" + | translate + }} +
- +
- {{ "PAGES.OPTIONS.APPLICATION.USE_HARDWARE_ACCELERATION_DESCRIPTION" | translate }} + {{ + "PAGES.OPTIONS.APPLICATION.USE_HARDWARE_ACCELERATION_DESCRIPTION" + | translate + }}
-
{{ "PAGES.OPTIONS.APPLICATION.START_WITH_SYSTEM_LABEL" | translate }}
- {{ "PAGES.OPTIONS.APPLICATION.START_WITH_SYSTEM_DESCRIPTION" | translate }} +
+ {{ "PAGES.OPTIONS.APPLICATION.START_WITH_SYSTEM_LABEL" | translate }} +
+ {{ + "PAGES.OPTIONS.APPLICATION.START_WITH_SYSTEM_DESCRIPTION" | translate + }}
- +
@@ -68,13 +120,66 @@
-
{{ "PAGES.OPTIONS.APPLICATION.START_MINIMIZED_LABEL" | translate }}
- {{ "PAGES.OPTIONS.APPLICATION.START_MINIMIZED_DESCRIPTION" | translate }} +
+ {{ "PAGES.OPTIONS.APPLICATION.START_MINIMIZED_LABEL" | translate }} +
+ {{ + "PAGES.OPTIONS.APPLICATION.START_MINIMIZED_DESCRIPTION" | translate + }}
- +
+ +
+
+
+
+ {{ "PAGES.OPTIONS.APPLICATION.SET_LANGUAGE_LABEL" | translate }} +
+ {{ + "PAGES.OPTIONS.APPLICATION.SET_LANGUAGE_DESCRIPTION" | translate + }} +
+ + {{ + "PAGES.OPTIONS.APPLICATION.CURRENT_LANGUAGE_LABEL" | translate + }} + + + +

English

+

German

+

Spanish

+

French

+

Italian

+

Korean

+

Norwegian

+

Portuguese

+

Russian

+

Chinese

+

{{ language }}

+ + + + +
+
diff --git a/wowup-electron/src/app/components/options-app-section/options-app-section.component.ts b/wowup-electron/src/app/components/options-app-section/options-app-section.component.ts index 7a420d42..5e094558 100644 --- a/wowup-electron/src/app/components/options-app-section/options-app-section.component.ts +++ b/wowup-electron/src/app/components/options-app-section/options-app-section.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from "@angular/core"; import { MatDialog } from "@angular/material/dialog"; +import { MatSelectChange } from "@angular/material/select"; import { MatSlideToggleChange } from "@angular/material/slide-toggle"; import { TranslateService } from "@ngx-translate/core"; import { ElectronService } from "app/services"; @@ -19,6 +20,8 @@ export class OptionsAppSectionComponent implements OnInit { public startWithSystem = false; public telemetryEnabled = false; public useHardwareAcceleration = true; + public setCurrentLanguage: string = ""; + public languages: string[] = []; constructor( private _analyticsService: AnalyticsService, @@ -48,6 +51,8 @@ export class OptionsAppSectionComponent implements OnInit { this.useHardwareAcceleration = this.wowupService.useHardwareAcceleration; this.startWithSystem = this.wowupService.startWithSystem; this.startMinimized = this.wowupService.startMinimized; + this.setCurrentLanguage = this.wowupService.setCurrentLanguage; + this.languages = this._translateService.getLangs(); } onEnableSystemNotifications = (evt: MatSlideToggleChange) => { @@ -99,4 +104,27 @@ export class OptionsAppSectionComponent implements OnInit { this._electronService.restartApplication(); }); }; + + onSetCurrentLanguageChange = (evt: MatSelectChange) => { + const dialogRef = this._dialog.open(ConfirmDialogComponent, { + data: { + title: this._translateService.instant( + "PAGES.OPTIONS.APPLICATION.SET_LANGUAGE_CONFIRMATION_LABEL" + ), + message: this._translateService.instant( + "PAGES.OPTIONS.APPLICATION.SET_LANGUAGE_CONFIRMATION_DESCRIPTION" + ), + }, + }); + + dialogRef.afterClosed().subscribe((result) => { + if (!result) { + evt.value = "en"; + return; + } + + this.wowupService.setCurrentLanguage = evt.value; + this._electronService.restartApplication(); + }); + }; } diff --git a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html index a33e746e..2a52033a 100644 --- a/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html +++ b/wowup-electron/src/app/components/wow-client-options/wow-client-options.component.html @@ -18,8 +18,15 @@ }} - @@ -31,10 +38,19 @@ {{ "PAGES.OPTIONS.WOW.DEFAULT_ADDON_CHANNEL_SELECT_LABEL" | translate }} - - {{ channel.name | translate }} + + {{ channel.name | translate }} @@ -45,7 +61,13 @@ "PAGES.OPTIONS.WOW.AUTO_UPDATE_DESCRIPTION" | translate }} - + - \ No newline at end of file + diff --git a/wowup-electron/src/app/services/wowup/wowup.service.ts b/wowup-electron/src/app/services/wowup/wowup.service.ts index b90e3f60..c8ee6b40 100644 --- a/wowup-electron/src/app/services/wowup/wowup.service.ts +++ b/wowup-electron/src/app/services/wowup/wowup.service.ts @@ -17,6 +17,7 @@ import { START_WITH_SYSTEM_PREFERENCE_KEY, USE_HARDWARE_ACCELERATION_PREFERENCE_KEY, WOWUP_RELEASE_CHANNEL_PREFERENCE_KEY, + SET_LANGUAGE_PREFERENCE_KEY, } from "../../../common/constants"; import { WowClientType } from "../../models/warcraft/wow-client-type"; import { AddonChannelType } from "../../models/wowup/addon-channel-type"; @@ -114,6 +115,20 @@ export class WowUpService { this._preferenceChangeSrc.next({ key, value: value.toString() }); } + public get setCurrentLanguage() { + const preference = this._preferenceStorageService.findByKey( + SET_LANGUAGE_PREFERENCE_KEY + ); + console.log("Set Language Preference: " + preference); + return preference; + } + + public set setCurrentLanguage(value: string) { + const key = SET_LANGUAGE_PREFERENCE_KEY; + this._preferenceStorageService.set(key, value); + this._preferenceChangeSrc.next({ key, value: value.toString() }); + } + public get startWithSystem() { const preference = this._preferenceStorageService.findByKey( START_WITH_SYSTEM_PREFERENCE_KEY @@ -268,6 +283,7 @@ export class WowUpService { this.setDefaultPreference(ENABLE_SYSTEM_NOTIFICATIONS_PREFERENCE_KEY, true); this.setDefaultPreference(COLLAPSE_TO_TRAY_PREFERENCE_KEY, true); this.setDefaultPreference(USE_HARDWARE_ACCELERATION_PREFERENCE_KEY, true); + this.setDefaultPreference(SET_LANGUAGE_PREFERENCE_KEY, "en"); this.setDefaultPreference( WOWUP_RELEASE_CHANNEL_PREFERENCE_KEY, this.getDefaultReleaseChannel() diff --git a/wowup-electron/src/assets/i18n/de.json b/wowup-electron/src/assets/i18n/de.json index 1b18ff26..4ced4a30 100644 --- a/wowup-electron/src/assets/i18n/de.json +++ b/wowup-electron/src/assets/i18n/de.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "Beim schließen WowUp in der Menübar minimieren", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "Beim Schließen des WowUp-Fensters auf das Systemabschnitt minimieren.", "MINIMIZE_ON_CLOSE_LABEL": "Minimieren beim Schliessen", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...und wird nicht auf dem Bildschirm angezeigt", "START_MINIMIZED_LABEL": "Starte WowUp minimiert", "START_WITH_SYSTEM_DESCRIPTION": "WowUp wird direkt gestartet, nachdem dein Betriebssystem geladen wurde...", diff --git a/wowup-electron/src/assets/i18n/en.json b/wowup-electron/src/assets/i18n/en.json index f5dc7efe..94066aca 100644 --- a/wowup-electron/src/assets/i18n/en.json +++ b/wowup-electron/src/assets/i18n/en.json @@ -188,6 +188,11 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "When closing the WowUp window, minimize to the menu bar.", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "When closing the WowUp window, minimize to the taskbar notification area.", "MINIMIZE_ON_CLOSE_LABEL": "Minimize on Close", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", + "CURRENT_LANGUAGE_LABEL": "Current Language", "START_MINIMIZED_DESCRIPTION": "WowUp will start minimized and not show up.", "START_MINIMIZED_LABEL": "Launch WowUp minimized", "START_WITH_SYSTEM_DESCRIPTION": "WowUp will be started automatically when you start up your system.", diff --git a/wowup-electron/src/assets/i18n/es.json b/wowup-electron/src/assets/i18n/es.json index ee53988e..14c89673 100644 --- a/wowup-electron/src/assets/i18n/es.json +++ b/wowup-electron/src/assets/i18n/es.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "Al cerrar la ventana de WowUp, minimízala a la bandeja del sistema.", "MINIMIZE_ON_CLOSE_LABEL": "Minimizar al Cerrar", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...and will not show up on the screen", "START_MINIMIZED_LABEL": "Launch WowUp minimized", "START_WITH_SYSTEM_DESCRIPTION": "WowUp will be launched immediately after your operational system is loaded...", diff --git a/wowup-electron/src/assets/i18n/fr.json b/wowup-electron/src/assets/i18n/fr.json index 9674e49b..32936be9 100644 --- a/wowup-electron/src/assets/i18n/fr.json +++ b/wowup-electron/src/assets/i18n/fr.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "Lorsque vous fermez la fenêtre WowUp, minimisez dans la barre d'état système.", "MINIMIZE_ON_CLOSE_LABEL": "Minimiser à la fermeture", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...and will not show up on the screen", "START_MINIMIZED_LABEL": "Launch WowUp minimized", "START_WITH_SYSTEM_DESCRIPTION": "WowUp will be launched immediately after your operational system is loaded...", diff --git a/wowup-electron/src/assets/i18n/it.json b/wowup-electron/src/assets/i18n/it.json index 2cc193ef..4507b467 100644 --- a/wowup-electron/src/assets/i18n/it.json +++ b/wowup-electron/src/assets/i18n/it.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "Quando si chiude la finestra WowUp, minimizzare nella barra dei menu", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "Quando si chiude la finestra WowUp, minimizzare nella barra di sistema.", "MINIMIZE_ON_CLOSE_LABEL": "Minimizza alla chiusura", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...e non apparirà sullo schermo", "START_MINIMIZED_LABEL": "Lancia Wowup ridotto ad icona", "START_WITH_SYSTEM_DESCRIPTION": "WowUp verrà lanciato all'avvio del computer...", diff --git a/wowup-electron/src/assets/i18n/ko.json b/wowup-electron/src/assets/i18n/ko.json index e9508d20..dd3dee61 100644 --- a/wowup-electron/src/assets/i18n/ko.json +++ b/wowup-electron/src/assets/i18n/ko.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "When closing the WowUp window, minimize to the menu bar.", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "When closing the WowUp window, minimize to the taskbar notification area.", "MINIMIZE_ON_CLOSE_LABEL": "Minimize on Close", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...and will not show up on the screen", "START_MINIMIZED_LABEL": "Launch WowUp minimized", "START_WITH_SYSTEM_DESCRIPTION": "WowUp will be launched immediately after your operational system is loaded...", diff --git a/wowup-electron/src/assets/i18n/nb.json b/wowup-electron/src/assets/i18n/nb.json index 7d8de842..1da6b4d7 100644 --- a/wowup-electron/src/assets/i18n/nb.json +++ b/wowup-electron/src/assets/i18n/nb.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "Når WowUp-vinduet lukkes, minimer til menylinjen.", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "Når WowUp-vinduet lukkes, minimer til oppgavelinjens varselområde.", "MINIMIZE_ON_CLOSE_LABEL": "Minimer ved lukking", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...og vil ikke dukke opp på skjermen din", "START_MINIMIZED_LABEL": "Start WowUp minimert", "START_WITH_SYSTEM_DESCRIPTION": "WowUp vil startes umiddelbart etter at operativsystemet ditt er lastet...", diff --git a/wowup-electron/src/assets/i18n/pt.json b/wowup-electron/src/assets/i18n/pt.json index c7e9e554..9983a881 100644 --- a/wowup-electron/src/assets/i18n/pt.json +++ b/wowup-electron/src/assets/i18n/pt.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "Ao fechar a janela do WowUp, minimize para a bandeja do sistema.", "MINIMIZE_ON_CLOSE_LABEL": "Minimizar ao Fechar", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...and will not show up on the screen", "START_MINIMIZED_LABEL": "Launch WowUp minimized", "START_WITH_SYSTEM_DESCRIPTION": "WowUp will be launched immediately after your operational system is loaded...", diff --git a/wowup-electron/src/assets/i18n/ru.json b/wowup-electron/src/assets/i18n/ru.json index 99ea825f..5b0761cc 100644 --- a/wowup-electron/src/assets/i18n/ru.json +++ b/wowup-electron/src/assets/i18n/ru.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "При закрытии окна WowUp сворачивается в меню статуса.", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "При закрытии окна WowUp сворачивается в область уведомлений панели задач.", "MINIMIZE_ON_CLOSE_LABEL": "Свернуть в трей при закрытии", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...и не будет показан на экране", "START_MINIMIZED_LABEL": "Запускать WowUp свернутым", "START_WITH_SYSTEM_DESCRIPTION": "WowUp будет запущен сразу после загрузки операционной системы...", diff --git a/wowup-electron/src/assets/i18n/zh.json b/wowup-electron/src/assets/i18n/zh.json index 93b3bf50..bc04a7d8 100644 --- a/wowup-electron/src/assets/i18n/zh.json +++ b/wowup-electron/src/assets/i18n/zh.json @@ -188,6 +188,10 @@ "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC": "MINIMIZE_ON_CLOSE_DESCRIPTION_MAC", "MINIMIZE_ON_CLOSE_DESCRIPTION_WINDOWS": "关闭WowUp窗口时，最小化到系统托盘。", "MINIMIZE_ON_CLOSE_LABEL": "关闭时最小化", + "SET_LANGUAGE_CONFIRMATION_DESCRIPTION": "Changing the default language requires the application to restart.", + "SET_LANGUAGE_CONFIRMATION_LABEL": "Setting a new default language", + "SET_LANGUAGE_DESCRIPTION": "Select a language to change to", + "SET_LANGUAGE_LABEL": "Set Language", "START_MINIMIZED_DESCRIPTION": "...and will not show up on the screen", "START_MINIMIZED_LABEL": "Launch WowUp minimized", "START_WITH_SYSTEM_DESCRIPTION": "WowUp will be launched immediately after your operational system is loaded...", diff --git a/wowup-electron/src/common/constants.ts b/wowup-electron/src/common/constants.ts index ac9abb93..ad5d5ab3 100644 --- a/wowup-electron/src/common/constants.ts +++ b/wowup-electron/src/common/constants.ts @@ -31,6 +31,7 @@ export const START_MINIMIZED_PREFERENCE_KEY = "start_minimized"; export const NO_SEARCH_RESULTS_ERROR = "NO_SEARCH_RESULTS"; export const NO_LATEST_SEARCH_RESULT_FILES_ERROR = "NO_LATEST_SEARCH_RESULT_FILES"; +export const SET_LANGUAGE_PREFERENCE_KEY = "set_language"; // APP UPDATER export const APP_UPDATE_ERROR = "app-update-error";