diff --git a/source/Reloaded.Mod.Launcher/App.xaml.cs b/source/Reloaded.Mod.Launcher/App.xaml.cs index f4b11a06..483eb990 100644 --- a/source/Reloaded.Mod.Launcher/App.xaml.cs +++ b/source/Reloaded.Mod.Launcher/App.xaml.cs @@ -50,8 +50,18 @@ private void SetupResources() var themeSelector = new XamlFileSelector($"{launcherFolder}\\Theme"); var conf = Lib.IoC.GetConstant(); + if (conf.FirstLaunch) + { + // Default the language to user's system language. + // e.g. en-GB.xaml + var currentCulture = Thread.CurrentThread.CurrentUICulture + ".xaml"; + conf.LanguageFile = languageSelector.Files.FirstOrDefault(x => Path.GetFileName(x) == currentCulture) ?? conf.LanguageFile; + } + themeSelector.SelectXamlFileByName(Path.GetFileName(conf.ThemeFile)); languageSelector.SelectXamlFileByName(Path.GetFileName(conf.LanguageFile)); + + LibraryBindings.Init(languageSelector, themeSelector); // Ideally this should be in Setup, however the download dialogs should be localized.