From 44e238a19aea2688fa20751f25f9b52568882e24 Mon Sep 17 00:00:00 2001 From: HyperLexus Date: Fri, 13 Feb 2026 03:35:43 +0100 Subject: [PATCH 1/2] some language fixes (cherry picked from commit a743dc76bab2504adb91727a97368436b9f21d52) --- .../Resources/Languages/Phrases.de.resx | 21 ++++++++++++++ .../Resources/Languages/Settings.Designer.cs | 18 ++++++++++++ .../Resources/Languages/Settings.de.resx | 28 +++++++++++++++++-- WheelWizard/Resources/Languages/Settings.resx | 6 ++++ .../Pages/Settings/WhWzSettings.axaml.cs | 19 +++++++++---- .../Views/Popups/Generic/YesNoWindow.axaml | 4 +-- 6 files changed, 87 insertions(+), 9 deletions(-) diff --git a/WheelWizard/Resources/Languages/Phrases.de.resx b/WheelWizard/Resources/Languages/Phrases.de.resx index 5887eb5a..ad58718b 100644 --- a/WheelWizard/Resources/Languages/Phrases.de.resx +++ b/WheelWizard/Resources/Languages/Phrases.de.resx @@ -463,4 +463,25 @@ Um einem bestimmten Raum beizutreten, musst du entweder über einen Freund treff Von GameBanana unterstützt + + Fehler beim Verschieben von Daten. + + + Wheel WIzard's Daten sind jetzt gespeichert in:\n{$1} + + + Datenordner aktualisiert. + + + Du hast "DolphinTool.exe" ausgewählt. Bitte wähle stattdessen "Dolphin.exe" (die Dolphin Anwendung). + + + Falsche Dolphin executable ausgewählt. + + + Wheel Wizard wird seine Datein nach\n{$1}\nverschieben. Das könnte eine Weile dauern. + + + Wheel Wizard Daten verschieben? + \ No newline at end of file diff --git a/WheelWizard/Resources/Languages/Settings.Designer.cs b/WheelWizard/Resources/Languages/Settings.Designer.cs index 4a02b922..929e13f2 100644 --- a/WheelWizard/Resources/Languages/Settings.Designer.cs +++ b/WheelWizard/Resources/Languages/Settings.Designer.cs @@ -392,6 +392,24 @@ public static string Option_WindowScale { } } + /// + /// Looks up a localized string similar to Do you want to apply the new language settings?. + /// + public static string Question_ApplyLanguageSettings_Extra { + get { + return ResourceManager.GetString("Question_ApplyLanguageSettings_Extra", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to This will close the current window and open a new one with the new language settings.. + /// + public static string Question_ApplyLanguageSettings_Title { + get { + return ResourceManager.GetString("Question_ApplyLanguageSettings_Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Installation. /// diff --git a/WheelWizard/Resources/Languages/Settings.de.resx b/WheelWizard/Resources/Languages/Settings.de.resx index ae498992..2889d5d1 100644 --- a/WheelWizard/Resources/Languages/Settings.de.resx +++ b/WheelWizard/Resources/Languages/Settings.de.resx @@ -160,7 +160,7 @@ Norwegisch - Portugisisch + Portugiesisch Sonstiges @@ -169,7 +169,7 @@ Allgemein - Über + Über uns Spielordner öffnen @@ -198,4 +198,28 @@ Dies ändert nur die Sprache innerhalb von Wheel Wizard. Um die Sprache innerhalb des Spiels zu ändern musst du das in den Spieleinstellungen vornehmen + + Wähle aus, wo Wheel Wizard seine Dateien speichert. Das Verschieben könnte eine Weile dauern. + + + Standard-Speicherort verwenden + + + Ordner für Wheel Wizard Daten + + + Verwendet benutzerdefinierten Speicherort + + + Standard-Speicherort wird verwendet. + + + Dateien werden verschoben, bitte warten... + + + Neue Spracheinstellungen anwenden? + + + Das jetzige Fenster wird sich schließen und ein neues wird sich mit den neuen Spracheinstellunge öffnen. + \ No newline at end of file diff --git a/WheelWizard/Resources/Languages/Settings.resx b/WheelWizard/Resources/Languages/Settings.resx index adee40eb..f7b8a039 100644 --- a/WheelWizard/Resources/Languages/Settings.resx +++ b/WheelWizard/Resources/Languages/Settings.resx @@ -269,4 +269,10 @@ You must set these 3 paths before you can start playing Retro Rewind + + This will close the current window and open a new one with the new language settings. + + + Do you want to apply the new language settings? + diff --git a/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs b/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs index e2088b9c..fbf58c66 100644 --- a/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs +++ b/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs @@ -34,7 +34,7 @@ public WhWzSettings() UpdateAppDataLocationUi(); _pageLoaded = true; - MKGameFieldLabel.TipText = SettingsResource.HelperText_EndWithX + "Path can end with: .wbfs/.iso/.rvz"; + MKGameFieldLabel.TipText = SettingsResource.HelperText_EndWithX + " .wbfs/.iso/.rvz"; WhWzLanguageDropdown.SelectionChanged += WhWzLanguageDropdown_OnSelectionChanged; } @@ -701,17 +701,26 @@ private async void WhWzLanguageDropdown_OnSelectionChanged(object? sender, Selec if (key == null || key == currentLanguage) return; - // TODO: translate this popup, but support multiple languages. So it should display both NL and FR when you try to switch from NL to FR + var currentCulture = new System.Globalization.CultureInfo(currentLanguage); + var targetCulture = new System.Globalization.CultureInfo(key); + + var titleCurrent = SettingsResource.ResourceManager.GetString("Question_ApplyLanguageSettings_Title", currentCulture); + var titleTarget = SettingsResource.ResourceManager.GetString("Question_ApplyLanguageSettings_Title", targetCulture); + + var extraCurrent = SettingsResource.ResourceManager.GetString("Question_ApplyLanguageSettings_Extra", currentCulture); + var extraTarget = SettingsResource.ResourceManager.GetString("Question_ApplyLanguageSettings_Extra", targetCulture); + + // popup now shows its selection in both languages var yesNoWindow = await new YesNoWindow() - .SetMainText("Do you want to apply the new language settings?") - .SetExtraText("This will close the current window and open a new one with the new language settings.") + .SetMainText($"{titleCurrent}\n\n{titleTarget}") + .SetExtraText($"{extraCurrent}\n\n{extraTarget}") .SetButtonText(Common.Action_Apply, Common.Action_Cancel) .AwaitAnswer(); if (!yesNoWindow) { var currentWhWzLanguage = (string)SettingsManager.WW_LANGUAGE.Get(); - var whWzLanguageDisplayName = SettingValues.WhWzLanguages[currentWhWzLanguage]; + var whWzLanguageDisplayName = SettingValues.WhWzLanguages[currentWhWzLanguage](); // gets the name of the current language back if the change was aborted WhWzLanguageDropdown.SelectedItem = whWzLanguageDisplayName; return; // We only want to change the setting if we really apply this change } diff --git a/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml b/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml index 906ff9a8..5942030d 100644 --- a/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml +++ b/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml @@ -7,7 +7,7 @@ xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="WheelWizard.Views.Popups.Generic.YesNoWindow"> - + - Date: Fri, 13 Feb 2026 04:05:13 +0100 Subject: [PATCH 2/2] forgot an n :skull: --- WheelWizard/Resources/Languages/Settings.de.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WheelWizard/Resources/Languages/Settings.de.resx b/WheelWizard/Resources/Languages/Settings.de.resx index 2889d5d1..be59335a 100644 --- a/WheelWizard/Resources/Languages/Settings.de.resx +++ b/WheelWizard/Resources/Languages/Settings.de.resx @@ -220,6 +220,6 @@ Neue Spracheinstellungen anwenden? - Das jetzige Fenster wird sich schließen und ein neues wird sich mit den neuen Spracheinstellunge öffnen. + Das jetzige Fenster wird sich schließen und ein neues wird sich mit den neuen Spracheinstellungen öffnen. \ No newline at end of file