From fa2df93dd7b23aa3be56da3da358854984c969e9 Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 25 May 2024 14:03:14 +0800
Subject: [PATCH 1/3] Fix calculator decimal separator bug

---
 Flow.Launcher.Core/Resource/Internationalization.cs      | 9 +++------
 Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs  | 2 +-
 .../ViewModels/SettingsPaneThemeViewModel.cs             | 6 ++----
 Flow.Launcher/ViewModel/MainViewModel.cs                 | 5 ++---
 Plugins/Flow.Launcher.Plugin.Calculator/Main.cs          | 4 ++--
 Plugins/Flow.Launcher.Plugin.Calculator/plugin.json      | 2 +-
 6 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
index acc693ed527..06eb868b88e 100644
--- a/Flow.Launcher.Core/Resource/Internationalization.cs
+++ b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -96,13 +96,10 @@ public void ChangeLanguage(Language language)
             {
                 LoadLanguage(language);
             }
-            // Culture of this thread
-            // Use CreateSpecificCulture to preserve possible user-override settings in Windows
+            // Culture of main thread
+            // Use CreateSpecificCulture to preserve possible user-override settings in Windows, if Flow's language culture is the same as Windows's
             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;
@@ -193,7 +190,7 @@ private void UpdatePluginMetadataTranslations()
                 {
                     p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();
                     p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();
-                    pluginI18N.OnCultureInfoChanged(CultureInfo.DefaultThreadCurrentCulture);
+                    pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);
                 }
                 catch (Exception e)
                 {
diff --git a/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs b/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs
index fabd01a24d1..ed94771f04e 100644
--- a/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs
+++ b/Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs
@@ -44,7 +44,7 @@ values[2] is not string queryText ||
             // Check if Text will be larger than our QueryTextBox
             Typeface typeface = new Typeface(queryTextBox.FontFamily, queryTextBox.FontStyle, queryTextBox.FontWeight, queryTextBox.FontStretch);
             // TODO: Obsolete warning?
-            var ft = new FormattedText(queryTextBox.Text, CultureInfo.DefaultThreadCurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, queryTextBox.FontSize, Brushes.Black);
+            var ft = new FormattedText(queryTextBox.Text, CultureInfo.CurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, queryTextBox.FontSize, Brushes.Black);
 
             var offset = queryTextBox.Padding.Right;
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index bcdd94e1ca9..87c5b6aa846 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -21,8 +21,6 @@ namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneThemeViewModel : BaseModel
 {
-    private CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;
-
     public Settings Settings { get; }
 
     public static string LinkHowToCreateTheme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme";
@@ -136,9 +134,9 @@ public string DateFormat
         set => Settings.DateFormat = value;
     }
 
-    public string ClockText => DateTime.Now.ToString(TimeFormat, Culture);
+    public string ClockText => DateTime.Now.ToString(TimeFormat, CultureInfo.CurrentCulture);
 
-    public string DateText => DateTime.Now.ToString(DateFormat, Culture);
+    public string DateText => DateTime.Now.ToString(DateFormat, CultureInfo.CurrentCulture);
 
     public double WindowWidthSize
     {
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 01dc67b9844..13d9d3bdf00 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -485,7 +485,6 @@ public void CopyAlternative()
         public Settings Settings { get; }
         public string ClockText { get; private set; }
         public string DateText { get; private set; }
-        public CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;
 
         private async Task RegisterClockAndDateUpdateAsync()
         {
@@ -494,9 +493,9 @@ private async Task RegisterClockAndDateUpdateAsync()
             while (await timer.WaitForNextTickAsync().ConfigureAwait(false))
             {
                 if (Settings.UseClock)
-                    ClockText = DateTime.Now.ToString(Settings.TimeFormat, Culture);
+                    ClockText = DateTime.Now.ToString(Settings.TimeFormat, CultureInfo.CurrentCulture);
                 if (Settings.UseDate)
-                    DateText = DateTime.Now.ToString(Settings.DateFormat, Culture);
+                    DateText = DateTime.Now.ToString(Settings.DateFormat, CultureInfo.CurrentCulture);
             }
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
index 338b5bcbe43..ade684ca163 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -62,7 +62,7 @@ public List<Result> Query(Query query)
                 switch (_settings.DecimalSeparator)
                 {
                     case DecimalSeparator.Comma:
-                    case DecimalSeparator.UseSystemLocale when CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
+                    case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
                         expression = query.Search.Replace(",", ".");
                         break;
                     default:
@@ -158,7 +158,7 @@ private string ChangeDecimalSeparator(decimal value, string newDecimalSeparator)
 
         private string GetDecimalSeparator()
         {
-            string systemDecimalSeperator = CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator;
+            string systemDecimalSeperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
             switch (_settings.DecimalSeparator)
             {
                 case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
index a77475460c0..ac2ece7b5b9 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Calculator",
   "Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
   "Author": "cxfksword",
-  "Version": "3.1.0",
+  "Version": "3.1.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",

From 27392a53c3618425d047edda1189117c1bf4cb0a Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 25 May 2024 14:28:26 +0800
Subject: [PATCH 2/3] Fix output path

---
 .../Flow.Launcher.Plugin.Calculator.csproj                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
index 415f852f4c8..178485a8fed 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Output\Debug\Plugins\Flow.Launcher.Plugin.Caculator\</OutputPath>
+    <OutputPath>..\..\Output\Debug\Plugins\Flow.Launcher.Plugin.Calculator\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Output\Release\Plugins\Flow.Launcher.Plugin.Caculator\</OutputPath>
+    <OutputPath>..\..\Output\Release\Plugins\Flow.Launcher.Plugin.Calculator\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

From e4621a5c878071861aa84eaef749f707b930c260 Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sat, 25 May 2024 14:35:14 +0800
Subject: [PATCH 3/3] Fix calculator typo

---
 Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs | 2 +-
 .../Flow.Launcher.Plugin.Calculator.csproj                  | 4 ++--
 Plugins/Flow.Launcher.Plugin.Calculator/Main.cs             | 6 +++---
 Plugins/Flow.Launcher.Plugin.Calculator/NumberTranslator.cs | 2 +-
 Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs         | 2 +-
 .../ViewModels/SettingsViewModel.cs                         | 2 +-
 .../Views/CalculatorSettings.xaml                           | 6 +++---
 .../Views/CalculatorSettings.xaml.cs                        | 4 ++--
 Plugins/Flow.Launcher.Plugin.Calculator/plugin.json         | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs b/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs
index 27bdf94ee10..81a68739b92 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/DecimalSeparator.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Flow.Launcher.Core.Resource;
 
-namespace Flow.Launcher.Plugin.Caculator
+namespace Flow.Launcher.Plugin.Calculator
 {
     [TypeConverter(typeof(LocalizationConverter))]
     public enum DecimalSeparator
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
index 178485a8fed..69c03b877fd 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
@@ -5,8 +5,8 @@
     <TargetFramework>net7.0-windows</TargetFramework>
     <ProjectGuid>{59BD9891-3837-438A-958D-ADC7F91F6F7E}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Flow.Launcher.Plugin.Caculator</RootNamespace>
-    <AssemblyName>Flow.Launcher.Plugin.Caculator</AssemblyName>
+    <RootNamespace>Flow.Launcher.Plugin.Calculator</RootNamespace>
+    <AssemblyName>Flow.Launcher.Plugin.Calculator</AssemblyName>
     <UseWPF>true</UseWPF>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
index ade684ca163..5077e60614d 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -6,10 +6,10 @@
 using System.Windows;
 using System.Windows.Controls;
 using Mages.Core;
-using Flow.Launcher.Plugin.Caculator.ViewModels;
-using Flow.Launcher.Plugin.Caculator.Views;
+using Flow.Launcher.Plugin.Calculator.ViewModels;
+using Flow.Launcher.Plugin.Calculator.Views;
 
-namespace Flow.Launcher.Plugin.Caculator
+namespace Flow.Launcher.Plugin.Calculator
 {
     public class Main : IPlugin, IPluginI18n, ISettingProvider
     {
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/NumberTranslator.cs b/Plugins/Flow.Launcher.Plugin.Calculator/NumberTranslator.cs
index ed4aed75bd4..4eacb9d349c 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/NumberTranslator.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/NumberTranslator.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace Flow.Launcher.Plugin.Caculator
+namespace Flow.Launcher.Plugin.Calculator
 {
     /// <summary>
     /// Tries to convert all numbers in a text from one culture format to another.
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
index 61551487381..8354863b852 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
@@ -1,5 +1,5 @@
 
-namespace Flow.Launcher.Plugin.Caculator
+namespace Flow.Launcher.Plugin.Calculator
 {
     public class Settings
     {
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs
index afe4d1c0cb0..09f745669fc 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/ViewModels/SettingsViewModel.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Flow.Launcher.Plugin.Caculator.ViewModels
+namespace Flow.Launcher.Plugin.Calculator.ViewModels
 {
     public class SettingsViewModel : BaseModel
     {
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index 9fd4bb17c90..d6237c6daf6 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -1,13 +1,13 @@
 <UserControl
-    x:Class="Flow.Launcher.Plugin.Caculator.Views.CalculatorSettings"
+    x:Class="Flow.Launcher.Plugin.Calculator.Views.CalculatorSettings"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Caculator"
+    xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Calculator"
     xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
-    xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Caculator.ViewModels"
+    xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Calculator.ViewModels"
     d:DesignHeight="450"
     d:DesignWidth="800"
     Loaded="CalculatorSettings_Loaded"
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml.cs
index 1f15aceaa1d..edb73470cec 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml.cs
@@ -1,8 +1,8 @@
 using System.Windows;
 using System.Windows.Controls;
-using Flow.Launcher.Plugin.Caculator.ViewModels;
+using Flow.Launcher.Plugin.Calculator.ViewModels;
 
-namespace Flow.Launcher.Plugin.Caculator.Views
+namespace Flow.Launcher.Plugin.Calculator.Views
 {
     /// <summary>
     /// Interaction logic for CalculatorSettings.xaml
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
index ac2ece7b5b9..6abc416681a 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/plugin.json
@@ -7,6 +7,6 @@
   "Version": "3.1.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
-  "ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",
+  "ExecuteFileName": "Flow.Launcher.Plugin.Calculator.dll",
   "IcoPath": "Images\\calculator.png"
 }
\ No newline at end of file