From 0adfeff82e009ba825a5ced3d6939e027a4fad27 Mon Sep 17 00:00:00 2001 From: Jack Baron Date: Tue, 21 Sep 2021 18:57:40 +0100 Subject: [PATCH] minor cleanup --- ModAssistant/Classes/Languages.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ModAssistant/Classes/Languages.cs b/ModAssistant/Classes/Languages.cs index dd58cf4f..b7bb4625 100644 --- a/ModAssistant/Classes/Languages.cs +++ b/ModAssistant/Classes/Languages.cs @@ -8,10 +8,10 @@ namespace ModAssistant { - class Languages + internal class Languages { public static string LoadedLanguage { get; private set; } - public static List LoadedLanguages { get => availableCultures.ToList(); } + public static List LoadedLanguages => availableCultures.ToList(); public static bool FirstRun = true; private static readonly string[] availableLanguageCodes = { "de", "en", "es", "fr", "it", "ko", "nb", "nl", "pl", "ru", "sv", "th", "zh" }; private static IEnumerable availableCultures; @@ -29,9 +29,10 @@ public static void LoadLanguages() // If no language code was saved, load system language if (!LoadLanguage(CultureInfo.CurrentUICulture.Name)) { - LoadLanguage("en"); + _ = LoadLanguage("en"); } } + UpdateUI(LoadedLanguage); } @@ -54,7 +55,11 @@ public static ResourceDictionary LanguagesDict public static bool LoadLanguage(string languageCode) { - if (string.IsNullOrEmpty(languageCode)) return false; + if (string.IsNullOrEmpty(languageCode)) + { + return false; + } + try { LanguagesDict.Source = new Uri($"Localisation/{languageCode}.xaml", UriKind.Relative); @@ -67,6 +72,7 @@ public static bool LoadLanguage(string languageCode) { return LoadLanguage(languageCode.Split('-').First()); } + return false; } }