Fix installer nav buttons not being translated

bloxstraplabs · Oct 8, 2024 · c491832 · c491832
1 parent d297c5a
commit c491832
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
@@ -1221,4 +1221,8 @@ Would you like to enable test mode?</value>
   <data name="About.Translators.Description" xml:space="preserve">
     <value>All of Bloxstrap's translations are crowdsourced through [Crowdin]({0}). Everyone listed here are people who generously volunteered their time and effort to help localise Bloxstrap. A massive thank you to everyone here!</value>
   </data>
+  <data name="Common.Navigation.Install" xml:space="preserve">
+    <value>Install</value>
+    <comment>The word "Install" is being used as a verb in this instance, like the other navigation button texts of "Next" and "Back"</comment>
+  </data>
 </root>
diff --git a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml
@@ -7,8 +7,10 @@
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
         xmlns:base="clr-namespace:Bloxstrap.UI.Elements.Base"
         xmlns:resources="clr-namespace:Bloxstrap.Resources"
+        xmlns:dmodels="clr-namespace:Bloxstrap.UI.ViewModels.Installer"
         xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Installer"
         mc:Ignorable="d"
+        d:DataContext="{d:DesignInstance dmodels:MainWindowViewModel, IsDesignTimeCreatable=True}"
         Title="{x:Static resources:Strings.Installer_Title}"
         Height="540" Width="840" MinWidth="840"
         Background="{ui:ThemeResource ApplicationBackgroundBrush}"

diff --git a/Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs b/Bloxstrap/UI/Elements/Installer/Pages/CompletionPage.xaml.cs
@@ -28,7 +28,7 @@ private void UiPage_Loaded(object sender, RoutedEventArgs e)
         {
             if (Window.GetWindow(this) is MainWindow window)
             {
-                window.SetNextButtonText("Next");
+                window.SetNextButtonText(Strings.Common_Navigation_Next);
                 window.SetButtonEnabled("back", false);
             }
         }

diff --git a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml.cs
@@ -29,7 +29,7 @@ private void UiPage_Loaded(object sender, RoutedEventArgs e)
         {
             if (Window.GetWindow(this) is MainWindow window)
             {
-                window.SetNextButtonText("Install");
+                window.SetNextButtonText(Strings.Common_Navigation_Install);
                 window.NextPageCallback += NextPageCallback;
             }
         }

diff --git a/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs b/Bloxstrap/UI/Elements/Installer/Pages/WelcomePage.xaml.cs
@@ -25,7 +25,7 @@ public WelcomePage()
         private void UiPage_Loaded(object sender, RoutedEventArgs e)
         {
             if (Window.GetWindow(this) is MainWindow window)
-                window.SetNextButtonText("Next");
+                window.SetNextButtonText(Strings.Common_Navigation_Next);
 
             _viewModel.DoChecks();
         }