Improve locale file parsing error descriptions

Ryubing · Dec 25, 2024 · 0bacdb8 · 0bacdb8
1 parent 0ca4d6e
commit 0bacdb8
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/Ryujinx/Common/LocaleManager.cs b/src/Ryujinx/Common/LocaleManager.cs
@@ -143,11 +143,7 @@ public void LoadLanguage(string languageCode)
             LocaleChanged?.Invoke();
         }
 
-        #nullable enable
-
         private static LocalesJson? _localeData;
-
-        #nullable disable
 
         private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode)
         {
@@ -158,18 +154,28 @@ private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCo
 
             foreach (LocalesEntry locale in _localeData.Value.Locales)
             {
-                if (locale.Translations.Count != _localeData.Value.Languages.Count)
+                if (locale.Translations.Count < _localeData.Value.Languages.Count)
                 {
                     throw new Exception($"Locale key {{{locale.ID}}} is missing languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
+                } 
+
+                if (locale.Translations.Count > _localeData.Value.Languages.Count)
+                {
+                    throw new Exception($"Locale key {{{locale.ID}}} has too many languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
                 }
 
                 if (!Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
                     continue;
 
                 localeStrings[localeKey] =
-                    locale.Translations.TryGetValue(languageCode, out string val) && val != string.Empty
+                    locale.Translations.TryGetValue(languageCode, out string val) && !string.IsNullOrEmpty(val)
                         ? val
                         : locale.Translations[DefaultLanguageCode];
+
+                if (string.IsNullOrEmpty(localeStrings[localeKey]))
+                {
+                    throw new Exception($"Locale key '{locale.ID}' has no valid translations for desired language {languageCode}! {DefaultLanguageCode} is an empty string or null");
+                }
             }
 
             return localeStrings;