Fix reset to system locale not immediately applied

Author: eltos

PasteIntoFile/Main.cs

@@ -130,7 +130,9 @@ static int Main(string[] args) {
 
             // Localization
             try {
-                Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(Settings.Default.language);
+                SystemCulture = CultureInfo.CurrentCulture;
+                if (!string.IsNullOrEmpty(Settings.Default.language))
+                    Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(Settings.Default.language);
             } catch (CultureNotFoundException e) {
                 Console.WriteLine(e.Message);
             }
@@ -161,6 +163,7 @@ static int Main(string[] args) {
                 errs => DisplayHelp(parseResult, errs));
 
         }
+        public static CultureInfo SystemCulture { get; set; }
 
         static int DisplayHelp<T>(ParserResult<T> result, IEnumerable<Error> errs) {
             HelpText helpText;
@@ -415,7 +418,6 @@ static int RunConfig(ArgsConfig args) {
                     Wizard.SetAutosaveMode((bool)args.Autosave);
                 if (args.Language != null) {
                     Settings.Default.language = args.Language.ToLowerInvariant() == "auto" ? "" : args.Language;
-                    Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(Settings.Default.language);
                 }
                 if (args.RegisterContextMenu)
                     foreach (var entry in RegistryUtil.AllContextMenu) {

PasteIntoFile/Wizard.cs

@@ -63,19 +63,21 @@ private void UpdateLanguageMenu() {
 
             settingsMenuLanguage.DropDownItems.Clear();
             foreach (var culture in cultures) {
-                var flag = string.Concat(culture.TwoLetterISOLanguageName.ToUpperInvariant().Select(x => char.ConvertFromUtf32(x + 0x1F1A5))); // + "\ufe0f"
-                var description = Equals(culture, CultureInfo.InvariantCulture) ? Resources.str_system_language + @" 💻️"
+                //var flag = string.Concat(culture.TwoLetterISOLanguageName.ToUpperInvariant().Select(x => char.ConvertFromUtf32(x + 0x1F1A5))); // + "\ufe0f"
+                var code = Equals(culture, CultureInfo.InvariantCulture) ? "" : culture.Name;
+                var description = code == "" ? Resources.str_system_language + @" 💻️"
                     : culture.DisplayName + @" – " + culture.NativeName + @" [" + culture.Name + @"]";
 
                 var item = new ToolStripMenuItem(description, null, (sender, args) => {
-                    Settings.Default.language = culture.Name;
+                    Settings.Default.language = code;
                     Settings.Default.Save();
-                    Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(Settings.Default.language);
+                    Thread.CurrentThread.CurrentUICulture = string.IsNullOrEmpty(Settings.Default.language) ? Program.SystemCulture
+                        : CultureInfo.CreateSpecificCulture(Settings.Default.language);
                     ReloadUi();
                     Height += 100;
                 });
 
-                item.Checked = Settings.Default.language == culture.Name;
+                item.Checked = Settings.Default.language == code;
                 settingsMenuLanguage.DropDownItems.Add(item);
 
             }