Fix switching from any language to English

tsunamods-codes · Jun 24, 2022 · 8938566 · 8938566
1 parent 5176612
commit 8938566
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/SeventhHeavenUI/App.xaml.cs b/SeventhHeavenUI/App.xaml.cs
@@ -416,6 +416,9 @@ internal void SetLanguageDictionary(string cultureCode)
 
                 switch (cultureCode)
                 {
+                    case "en":
+                        dict.Source = new Uri("Resources\\StringResources.xaml", UriKind.Relative);
+                        break;
                     case "fr":
                         dict.Source = new Uri("Resources\\Languages\\StringResources.fr.xaml", UriKind.Relative);
                         break;
@@ -431,19 +434,17 @@ internal void SetLanguageDictionary(string cultureCode)
                     case "it":
                         dict.Source = new Uri("Resources\\Languages\\StringResources.it.xaml", UriKind.Relative);
                         break;
-                    default:
-                        cultureCode = "en";
+                    default:
+                        dict.Source = new Uri("Resources\\StringResources.xaml", UriKind.Relative);
+                        cultureCode = "en";
                         break;
                 }
             }
 
-            if (cultureCode != "en")
-            {
-                this.Resources.MergedDictionaries.RemoveAt(1); // remove the default string resources dictionary (second in merged dictionary in App.xaml)
-                this.Resources.MergedDictionaries.Add(dict);
-            }
-
             Sys.Settings.AppLanguage = cultureCode;
+
+            this.Resources.MergedDictionaries.RemoveAt(1); // remove the default string resources dictionary (second in merged dictionary in App.xaml)
+            this.Resources.MergedDictionaries.Add(dict);
         }
 
         public static string GetAppLanguage()

diff --git a/SeventhHeavenUI/ViewModels/SetLanguageViewModel.cs b/SeventhHeavenUI/ViewModels/SetLanguageViewModel.cs
@@ -82,7 +82,6 @@ internal bool SaveSelectedLanguageAsDefault()
             try
             {
                 Sys.Settings.AppLanguage = LanguagesMap[SelectedLanguage];
-                ConfigurationManager.RefreshSection("appSettings");
 
                 (App.Current as SeventhHeavenUI.App).SetLanguageDictionary(Sys.Settings.AppLanguage);
             }