Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions WheelWizard/Resources/Languages/Phrases.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -463,4 +463,25 @@ Um einem bestimmten Raum beizutreten, musst du entweder über einen Freund treff
<data name="Text_PoweredGamebanana" xml:space="preserve">
<value>Von GameBanana unterstützt</value>
</data>
<data name="MessageError_DataFolderMove_Title" xml:space="preserve">
<value>Fehler beim Verschieben von Daten.</value>
</data>
<data name="MessageSuccess_DataFolderMoved_Extra" xml:space="preserve">
<value>Wheel WIzard's Daten sind jetzt gespeichert in:\n{$1}</value>
</data>
<data name="MessageSuccess_DataFolderMoved_Title" xml:space="preserve">
<value>Datenordner aktualisiert.</value>
</data>
<data name="MessageWarning_DolphinToolSelected_Extra" xml:space="preserve">
<value>Du hast "DolphinTool.exe" ausgewählt. Bitte wähle stattdessen "Dolphin.exe" (die Dolphin Anwendung).</value>
</data>
<data name="MessageWarning_DolphinToolSelected_Title" xml:space="preserve">
<value>Falsche Dolphin executable ausgewählt.</value>
</data>
<data name="Question_MoveData_Extra" xml:space="preserve">
<value>Wheel Wizard wird seine Datein nach\n{$1}\nverschieben. Das könnte eine Weile dauern.</value>
</data>
<data name="Question_MoveData_Title" xml:space="preserve">
<value>Wheel Wizard Daten verschieben?</value>
</data>
</root>
18 changes: 18 additions & 0 deletions WheelWizard/Resources/Languages/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 26 additions & 2 deletions WheelWizard/Resources/Languages/Settings.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<value>Norwegisch</value>
</data>
<data name="Value_Language_Portuguese" xml:space="preserve">
<value>Portugisisch</value>
<value>Portugiesisch</value>
</data>
<data name="Category_Other" xml:space="preserve">
<value>Sonstiges</value>
Expand All @@ -169,7 +169,7 @@
<value>Allgemein</value>
</data>
<data name="Category_About" xml:space="preserve">
<value>Über</value>
<value>Über uns</value>
</data>
<data name="Option_OpenGameFolder" xml:space="preserve">
<value>Spielordner öffnen</value>
Expand Down Expand Up @@ -198,4 +198,28 @@
<data name="HelperText_WhWzLanguage" xml:space="preserve">
<value>Dies ändert nur die Sprache innerhalb von Wheel Wizard. Um die Sprache innerhalb des Spiels zu ändern musst du das in den Spieleinstellungen vornehmen</value>
</data>
<data name="HelperText_WheelWizardDataFolder" xml:space="preserve">
<value>Wähle aus, wo Wheel Wizard seine Dateien speichert. Das Verschieben könnte eine Weile dauern.</value>
</data>
<data name="Option_ResetDataFolder" xml:space="preserve">
<value>Standard-Speicherort verwenden</value>
</data>
<data name="Option_WheelWizardDataFolder" xml:space="preserve">
<value>Ordner für Wheel Wizard Daten</value>
</data>
<data name="Status_DataFolder_Custom" xml:space="preserve">
<value>Verwendet benutzerdefinierten Speicherort</value>
</data>
<data name="Status_DataFolder_Default" xml:space="preserve">
<value>Standard-Speicherort wird verwendet.</value>
</data>
<data name="Status_DataFolder_Moving" xml:space="preserve">
<value>Dateien werden verschoben, bitte warten...</value>
</data>
<data name="Question_ApplyLanguageSettings_Extra" xml:space="preserve">
<value>Neue Spracheinstellungen anwenden?</value>
</data>
<data name="Question_ApplyLanguageSettings_Title" xml:space="preserve">
<value>Das jetzige Fenster wird sich schließen und ein neues wird sich mit den neuen Spracheinstellungen öffnen.</value>
</data>
</root>
6 changes: 6 additions & 0 deletions WheelWizard/Resources/Languages/Settings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -269,4 +269,10 @@
<data name="HelperText_MustSetPaths" xml:space="preserve">
<value>You must set these 3 paths before you can start playing Retro Rewind</value>
</data>
<data name="Question_ApplyLanguageSettings_Title" xml:space="preserve">
<value>This will close the current window and open a new one with the new language settings.</value>
</data>
<data name="Question_ApplyLanguageSettings_Extra" xml:space="preserve">
<value>Do you want to apply the new language settings?</value>
</data>
</root>
19 changes: 14 additions & 5 deletions WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions WheelWizard/Views/Popups/Generic/YesNoWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<Grid Width="400" MinHeight="150" MaxHeight="350">
<Grid Width="400" MinHeight="150" MaxHeight="350" RowDefinitions="*,Auto">
<StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,10">

<TextBlock Classes="TitleText" x:Name="MainTextBlock"
Expand All @@ -19,7 +19,7 @@
HorizontalAlignment="Left" Margin="0,10,0,0" />
</StackPanel>

<UniformGrid Columns="2" HorizontalAlignment="Right" VerticalAlignment="Bottom"
<UniformGrid Grid.Row="1" Columns="2" HorizontalAlignment="Right" VerticalAlignment="Bottom"
x:Name="ButtonContainer">
<components:Button x:Name="NoButton" Variant="Default"
IsEnabled="True" Text="{x:Static lang:Common.Action_No}"
Expand Down
Loading