From 0875f3adac1c4d11241d5c7e5207eef5e52b4b54 Mon Sep 17 00:00:00 2001
From: 1011025m <37438176+1011025m@users.noreply.github.com>
Date: Sun, 3 Dec 2023 01:22:35 +0800
Subject: [PATCH] Fix some hardcoded strings

---
 Bloxstrap/Resources/Strings.Designer.cs       | 24 ++++++++++++++++++-
 Bloxstrap/Resources/Strings.resx              |  8 +++++++
 Bloxstrap/UI/Elements/Menu/MainWindow.xaml    |  2 +-
 .../UI/ViewModels/Menu/AppearanceViewModel.cs |  4 ++--
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs
index b5fe355..a5499f5 100644
--- a/Bloxstrap/Resources/Strings.Designer.cs
+++ b/Bloxstrap/Resources/Strings.Designer.cs
@@ -278,7 +278,29 @@ namespace Bloxstrap.Resources {
                 return ResourceManager.GetString("Bootstrapper.WMFNotFound", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to Style preview - Click the X button at the top right to close.
+        /// </summary>
+        public static string Bootstrapper_StylePreview_ImageCancel
+        {
+            get
+            {
+                return ResourceManager.GetString("Bootstrapper.StylePreview.ImageCancel", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Style preview - Click Cancel to close.
+        /// </summary>
+        public static string Bootstrapper_StylePreview_TextCancel
+        {
+            get
+            {
+                return ResourceManager.GetString("Bootstrapper.StylePreview.TextCancel", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Browse.
         /// </summary>
diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx
index 18b03f3..313453b 100644
--- a/Bloxstrap/Resources/Strings.resx
+++ b/Bloxstrap/Resources/Strings.resx
@@ -192,6 +192,14 @@ Your ReShade configuration files will still be saved, and you can locate them by
   <data name="Bootstrapper.WMFNotFound" xml:space="preserve">
     <value>Roblox requires the use of Windows Media Foundation components. You appear to be missing them, likely because you are using an N edition of Windows. Please install them first, and then launch Roblox.</value>
   </data>
+  <data name="Bootstrapper.StylePreview.ImageCancel" xml:space="preserve">
+    <value>Style preview - Click the X button at the top right to close</value>
+	<comment>Text for style previews that use an X button. Currently only applies to Byfron</comment>
+  </data>
+  <data name="Bootstrapper.StylePreview.TextCancel" xml:space="preserve">
+    <value>Style preview - Click Cancel to close</value>
+	<comment>Text for style previews that use text button that says "Cancel"</comment>
+  </data>
   <data name="Common.Browse" xml:space="preserve">
     <value>Browse</value>
   </data>
diff --git a/Bloxstrap/UI/Elements/Menu/MainWindow.xaml b/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
index edd7a10..ad73178 100644
--- a/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
+++ b/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
@@ -79,7 +79,7 @@
                 <ui:Button Content="{Binding ConfirmButtonText, Mode=OneTime}" Appearance="Primary" Command="{Binding ConfirmSettingsCommand, Mode=OneWay}" IsEnabled="{Binding ConfirmButtonEnabled, Mode=OneWay}" />
             </StatusBarItem>
             <StatusBarItem Grid.Column="2" Padding="4,0,0,0">
-                <ui:Button Content="Cancel" Command="{Binding CloseWindowCommand, Mode=OneWay}" />
+                <ui:Button Content="{x:Static resources:Strings.Common_Cancel}" Command="{Binding CloseWindowCommand, Mode=OneWay}" />
             </StatusBarItem>
         </StatusBar>
     </Grid>
diff --git a/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
index 3f160e4..8df58df 100644
--- a/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
@@ -23,9 +23,9 @@ namespace Bloxstrap.UI.ViewModels.Menu
             IBootstrapperDialog dialog = App.Settings.Prop.BootstrapperStyle.GetNew();
 
             if (App.Settings.Prop.BootstrapperStyle == BootstrapperStyle.ByfronDialog)
-                dialog.Message = "Style preview - Click the X button at the top right to close";
+                dialog.Message = Resources.Strings.Bootstrapper_StylePreview_ImageCancel;
             else
-                dialog.Message = "Style preview - Click Cancel to close";
+                dialog.Message = Resources.Strings.Bootstrapper_StylePreview_TextCancel;
 
             dialog.CancelEnabled = true;
             dialog.ShowBootstrapper();