Merge pull request #1568 from VictoriousRaptor/FixNewCultureInfo

[Dev] Fix new culture info

Author: taooceros

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -96,9 +96,16 @@ public void ChangeLanguage(Language language)
             {
                 LoadLanguage(language);
             }
-            Settings.Language = language.LanguageCode;
-            CultureInfo.CurrentCulture = new CultureInfo(language.LanguageCode);
+            // Culture of this thread
+            // Use CreateSpecificCulture to preserve possible user-override settings in Windows
+            CultureInfo.CurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
+            // App domain
+            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
+            CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.DefaultThreadCurrentCulture;
+
+            // Raise event after culture is set
+            Settings.Language = language.LanguageCode;
             _ = Task.Run(() =>
             {
                 UpdatePluginMetadataTranslations();
@@ -186,7 +193,7 @@ private void UpdatePluginMetadataTranslations()
                 {
                     p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();
                     p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();
-                    pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);
+                    pluginI18N.OnCultureInfoChanged(CultureInfo.DefaultThreadCurrentCulture);
                 }
                 catch (Exception e)
                 {

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -6,7 +6,6 @@
 using System.Windows;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
-using Flow.Launcher;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Infrastructure.UserSettings

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

@@ -52,7 +52,8 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
 
                 // Check if Text will be larger then our QueryTextBox
                 System.Windows.Media.Typeface typeface = new Typeface(QueryTextBox.FontFamily, QueryTextBox.FontStyle, QueryTextBox.FontWeight, QueryTextBox.FontStretch);
-                System.Windows.Media.FormattedText ft = new FormattedText(QueryTextBox.Text, System.Globalization.CultureInfo.CurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, QueryTextBox.FontSize, Brushes.Black);
+                // TODO: Obsolete warning?
+                System.Windows.Media.FormattedText ft = new FormattedText(QueryTextBox.Text, System.Globalization.CultureInfo.DefaultThreadCurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, QueryTextBox.FontSize, Brushes.Black);
 
                 var offset = QueryTextBox.Padding.Right;
 
@@ -75,4 +76,4 @@ public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
             throw new NotImplementedException();
         }
     }
-}
+}

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -65,9 +65,10 @@ public MainViewModel(Settings settings)
             Settings = settings;
             Settings.PropertyChanged += (_, args) =>
             {
-                if (args.PropertyName == nameof(Settings.WindowSize))
-                {
-                    OnPropertyChanged(nameof(MainWindowWidth));
+                switch (args.PropertyName) {
+                    case nameof(Settings.WindowSize):
+                        OnPropertyChanged(nameof(MainWindowWidth));
+                        break;
                 }
             };
 
@@ -334,20 +335,21 @@ private void Esc()
         public Settings Settings { get; }
         public string ClockText { get; private set; }
         public string DateText { get; private set; }
+        public CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;
 
-        public CultureInfo cultureInfo => new CultureInfo(Settings.Language);
         private async Task RegisterClockAndDateUpdateAsync()
         {
             var timer = new PeriodicTimer(TimeSpan.FromSeconds(1));
             // ReSharper disable once MethodSupportsCancellation
             while (await timer.WaitForNextTickAsync().ConfigureAwait(false))
             {
                 if (Settings.UseClock)
-                    ClockText = DateTime.Now.ToString(Settings.TimeFormat, cultureInfo);
+                    ClockText = DateTime.Now.ToString(Settings.TimeFormat, Culture);
                 if (Settings.UseDate)
-                    DateText = DateTime.Now.ToString(Settings.DateFormat, cultureInfo);
+                    DateText = DateTime.Now.ToString(Settings.DateFormat, Culture);
             }
         }
+
         public ResultsViewModel Results { get; private set; }
 
         public ResultsViewModel ContextMenu { get; private set; }

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -61,6 +61,7 @@ public SettingWindowViewModel(Updater updater, IPortable portable)
                         break;
                 }
             };
+
         }
 
         public Settings Settings { get; set; }
@@ -84,7 +85,7 @@ public bool AutoUpdates
             }
         }
 
-        public CultureInfo cultureInfo => new CultureInfo(Settings.Language);
+        public CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;
 
         public bool StartFlowLauncherOnSystemStartup
         {
@@ -496,20 +497,19 @@ public List<SearchWindowPosition> SearchWindowPositions
 
         public string TimeFormat
         {
-            get { return Settings.TimeFormat; }
-            set { Settings.TimeFormat = value; }
+            get => Settings.TimeFormat;
+            set => Settings.TimeFormat = value;
         }
 
         public string DateFormat
         {
-            get { return Settings.DateFormat; }
-            set { Settings.DateFormat = value; }
+            get => Settings.DateFormat;
+            set => Settings.DateFormat = value;
         }
 
-        public string ClockText => DateTime.Now.ToString(TimeFormat, cultureInfo);
-
-        public string DateText => DateTime.Now.ToString(DateFormat, cultureInfo);
+        public string ClockText => DateTime.Now.ToString(TimeFormat, Culture);
 
+        public string DateText => DateTime.Now.ToString(DateFormat, Culture);
 
         public double WindowWidthSize
         {

Plugins/Flow.Launcher.Plugin.Calculator/Main.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Runtime.InteropServices;
@@ -61,7 +61,7 @@ public List<Result> Query(Query query)
                 switch (_settings.DecimalSeparator)
                 {
                     case DecimalSeparator.Comma:
-                    case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
+                    case DecimalSeparator.UseSystemLocale when CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
                         expression = query.Search.Replace(",", ".");
                         break;
                     default:
@@ -157,7 +157,7 @@ private string ChangeDecimalSeparator(decimal value, string newDecimalSeparator)
 
         private string GetDecimalSeparator()
         {
-            string systemDecimalSeperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            string systemDecimalSeperator = CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator;
             switch (_settings.DecimalSeparator)
             {
                 case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;