Fix system language detection

JungleDruid · Aug 30, 2023 · b43e663 · b43e663
1 parent b0f1a4e
commit b43e663
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/BG3LocalizationMerger.csproj b/BG3LocalizationMerger.csproj
@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>x64</PlatformTarget>
     <NeutralLanguage>en</NeutralLanguage>
+    <Version>$(VersionPrefix)1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -36,23 +36,46 @@ public MainWindow()
             ReferencePackTextBox.Text = props.ReferencePackPath;
             ExportPathTextBox.Text = props.ExportPath;
 
+            InitCulture();
+        }
+
+        private void InitCulture()
+        {
             LanguageComboBox.ItemsSource = TranslationSource.GetAllCultures();
 
             string defaultCultureName = Properties.Settings.Default.CultureName;
             var defaultCulture = string.IsNullOrEmpty(defaultCultureName)
-                ? CultureInfo.CurrentCulture
+                ? CultureInfo.CurrentUICulture
                 : new CultureInfo(defaultCultureName);
 
             foreach (CultureInfo culture in LanguageComboBox.ItemsSource)
             {
                 if (culture.Equals(defaultCulture))
                 {
                     LanguageComboBox.SelectedItem = culture;
-                    break;
+                    return;
                 }
             }
-            if (LanguageComboBox.SelectedIndex < 0)
-                LanguageComboBox.SelectedIndex = 0;
+
+            foreach (CultureInfo culture in LanguageComboBox.ItemsSource)
+            {
+                if (culture.Equals(defaultCulture.Parent))
+                {
+                    LanguageComboBox.SelectedItem = culture;
+                    return;
+                }
+            }
+
+            foreach (CultureInfo culture in LanguageComboBox.ItemsSource)
+            {
+                if (culture.TwoLetterISOLanguageName == defaultCulture.TwoLetterISOLanguageName)
+                {
+                    LanguageComboBox.SelectedItem = culture;
+                    return;
+                }
+            }
+
+            LanguageComboBox.SelectedIndex = 0;
         }
 
         public static void Log(string text)