Fixed bug in language loading

EX3exp · Sep 29, 2024 · ad24daa · ad24daa
1 parent d9b4f82
commit ad24daa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Mirivoice/App.axaml.cs b/Mirivoice/App.axaml.cs
@@ -27,6 +27,8 @@ public override void Initialize()
         InitializeCulture();
     }
 
+    public static string[] Languages = new string[] { "en-US", "ko-KR"};
+
     public override void OnFrameworkInitializationCompleted()
     {
 
@@ -89,13 +91,15 @@ public static void SetLanguage(string language)
         }
         var translations = App.Current.Resources.MergedDictionaries.OfType<ResourceInclude>().FirstOrDefault(x => x.Source?.OriginalString?.Contains("/Lang/") ?? false);
 
-        if (!File.Exists( new Uri($"avares://Mirivoice.Main/Assets/Lang/{language}.axaml").LocalPath))
+        if (Languages.Contains(language) == false)
         {
+            Log.Warning($"Language {language} is not supported. Defaulting to en-US.");
             language = "en-US";
             MainManager.Instance.Setting.Langcode = language;
             MainManager.Instance.Setting.Save();
         }
 
+
         if (translations != null)
             App.Current.Resources.MergedDictionaries.Remove(translations);
 

diff --git a/Mirivoice/Mirivoice.Core/Managers/MainManager.cs b/Mirivoice/Mirivoice.Core/Managers/MainManager.cs
@@ -52,14 +52,14 @@ public void LoadVoicerManager()
         }
         public void LoadSetting()
         {
-            if (File.Exists(PathM.SettingsPath))
+            if (File.Exists(MainManager.Instance.PathM.SettingsPath))
             {
-                var yamlUtf8Bytes = System.Text.Encoding.UTF8.GetBytes(ReadTxtFile(PathM.SettingsPath));
-                Setting = YamlSerializer.Deserialize<UserSetting>(yamlUtf8Bytes);
+                var yamlUtf8Bytes = System.Text.Encoding.UTF8.GetBytes(ReadTxtFile(MainManager.Instance.PathM.SettingsPath));
+                MainManager.Instance.Setting = YamlSerializer.Deserialize<UserSetting>(yamlUtf8Bytes);
             }
             else
             {
-                Setting.Save();
+                MainManager.Instance.Setting.Save();
             }
         }
         private static void DeleteExtractedZip(string zipFilePath)