improve select language page

Scighost · Dec 29, 2023 · 4faf70d · 4faf70d
1 parent e0311c1
commit 4faf70d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/Starward/App.xaml.cs b/src/Starward/App.xaml.cs
@@ -171,10 +171,13 @@ private void InitializeLanguage()
     {
         try
         {
-            var lang = AppConfig.Language;
-            if (!string.IsNullOrWhiteSpace(lang))
+            if (!string.IsNullOrWhiteSpace(AppConfig.UserDataFolder))
             {
-                CultureInfo.CurrentUICulture = new CultureInfo(lang);
+                var lang = AppConfig.Language;
+                if (!string.IsNullOrWhiteSpace(lang))
+                {
+                    CultureInfo.CurrentUICulture = new CultureInfo(lang);
+                }
             }
         }
         catch { }

diff --git a/src/Starward/MyWindows/WelcomeWindow.xaml.cs b/src/Starward/MyWindows/WelcomeWindow.xaml.cs
@@ -5,7 +5,6 @@
 using Starward.Pages.Welcome;
 using Starward.Services;
 using System;
-using System.Globalization;
 using System.IO;
 using Vanara.PInvoke;
 using Windows.Graphics;
@@ -33,7 +32,6 @@ public WelcomeWindow()
         Current = this;
         this.InitializeComponent();
         InitializeWindow();
-        CultureInfo.CurrentUICulture = CultureInfo.InstalledUICulture;
     }
 
 

diff --git a/src/Starward/Pages/Welcome/SelectLanguagePage.xaml b/src/Starward/Pages/Welcome/SelectLanguagePage.xaml
@@ -62,7 +62,7 @@
                 <TextBlock FontSize="20"
                            FontWeight="SemiBold"
                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                           Text="Language" />
+                           Text="{x:Bind lang:Lang.SettingPage_Language}" />
                 <ComboBox Name="ComboBox_Language"
                           MinWidth="300"
                           SelectionChanged="ComboBox_Language_SelectionChanged" />
@@ -71,7 +71,7 @@
                            FontSize="20"
                            FontWeight="SemiBold"
                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
-                           Text="Windows Size" />
+                           Text="{x:Bind lang:Lang.SettingPage_WindowsSize}" />
                 <StackPanel Margin="0,-4,0,0"
                             Orientation="Horizontal"
                             Spacing="16">
@@ -81,7 +81,7 @@
                                  Tag="normal">
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <FontIcon FontSize="16" Glyph="&#xE740;" />
-                            <TextBlock Text="Normal" />
+                            <TextBlock Text="{x:Bind lang:Lang.SettingPage_Normal}" />
                         </StackPanel>
                     </RadioButton>
                     <RadioButton Name="RadioButton_WindowSize_Small"
@@ -90,7 +90,7 @@
                                  Tag="small">
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <FontIcon FontSize="16" Glyph="&#xE73F;" />
-                            <TextBlock Text="Small" />
+                            <TextBlock Text="{x:Bind lang:Lang.SettingPage_Small}" />
                         </StackPanel>
                     </RadioButton>
                 </StackPanel>