Merge pull request #2722 from Flow-Launcher/fix-decimal

jjw24 · web-flow · commit 6eb8ef687c7d · 2024-05-26T12:46:38.000+10:00
Fix bug and typo in Calculator Plugin
diff --git 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
@@ -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
@@ -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
@@ -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/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
@@ -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>
@@ -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>
diff --git 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
     {
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,9 +4,9 @@
   "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",
+  "ExecuteFileName": "Flow.Launcher.Plugin.Calculator.dll",
   "IcoPath": "Images\\calculator.png"
 }

Original file line number	Diff line number	Diff line change
`@@ -96,13 +96,10 @@ public void ChangeLanguage(Language language)`
`96`	`96`	`{`
`97`	`97`	`LoadLanguage(language);`
`98`	`98`	`}`
`99`		`- // Culture of this thread`
`100`		`- // Use CreateSpecificCulture to preserve possible user-override settings in Windows`
	`99`	`+ // Culture of main thread`
	`100`	`+ // Use CreateSpecificCulture to preserve possible user-override settings in Windows, if Flow's language culture is the same as Windows's`
`101`	`101`	`CultureInfo.CurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);`
`102`	`102`	`CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;`
`103`		`- // App domain`
`104`		`- CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);`
`105`		`- CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.DefaultThreadCurrentCulture;`
`106`	`103`
`107`	`104`	`// Raise event after culture is set`
`108`	`105`	`Settings.Language = language.LanguageCode;`
`@@ -193,7 +190,7 @@ private void UpdatePluginMetadataTranslations()`
`193`	`190`	`{`
`194`	`191`	`p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();`
`195`	`192`	`p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();`
`196`		`- pluginI18N.OnCultureInfoChanged(CultureInfo.DefaultThreadCurrentCulture);`
	`193`	`+ pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);`
`197`	`194`	`}`
`198`	`195`	`catch (Exception e)`
`199`	`196`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ namespace Flow.Launcher.SettingPages.ViewModels;`
`21`	`21`
`22`	`22`	`public partial class SettingsPaneThemeViewModel : BaseModel`
`23`	`23`	`{`
`24`		`- private CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;`
`25`		`-`
`26`	`24`	`public Settings Settings { get; }`
`27`	`25`
`28`	`26`	`public static string LinkHowToCreateTheme => @"https://flowlauncher.com/docs/#/how-to-create-a-theme";`
`@@ -136,9 +134,9 @@ public string DateFormat`
`136`	`134`	`set => Settings.DateFormat = value;`
`137`	`135`	`}`
`138`	`136`
`139`		`- public string ClockText => DateTime.Now.ToString(TimeFormat, Culture);`
	`137`	`+ public string ClockText => DateTime.Now.ToString(TimeFormat, CultureInfo.CurrentCulture);`
`140`	`138`
`141`		`- public string DateText => DateTime.Now.ToString(DateFormat, Culture);`
	`139`	`+ public string DateText => DateTime.Now.ToString(DateFormat, CultureInfo.CurrentCulture);`
`142`	`140`
`143`	`141`	`public double WindowWidthSize`
`144`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,6 @@ public void CopyAlternative()`
`485`	`485`	`public Settings Settings { get; }`
`486`	`486`	`public string ClockText { get; private set; }`
`487`	`487`	`public string DateText { get; private set; }`
`488`		`- public CultureInfo Culture => CultureInfo.DefaultThreadCurrentCulture;`
`489`	`488`
`490`	`489`	`private async Task RegisterClockAndDateUpdateAsync()`
`491`	`490`	`{`
`@@ -494,9 +493,9 @@ private async Task RegisterClockAndDateUpdateAsync()`
`494`	`493`	`while (await timer.WaitForNextTickAsync().ConfigureAwait(false))`
`495`	`494`	`{`
`496`	`495`	`if (Settings.UseClock)`
`497`		`- ClockText = DateTime.Now.ToString(Settings.TimeFormat, Culture);`
	`496`	`+ ClockText = DateTime.Now.ToString(Settings.TimeFormat, CultureInfo.CurrentCulture);`
`498`	`497`	`if (Settings.UseDate)`
`499`		`- DateText = DateTime.Now.ToString(Settings.DateFormat, Culture);`
	`498`	`+ DateText = DateTime.Now.ToString(Settings.DateFormat, CultureInfo.CurrentCulture);`
`500`	`499`	`}`
`501`	`500`	`}`
`502`	`501`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.ComponentModel;`
`2`	`2`	`using Flow.Launcher.Core.Resource;`
`3`	`3`
`4`		`-namespace Flow.Launcher.Plugin.Caculator`
	`4`	`+namespace Flow.Launcher.Plugin.Calculator`
`5`	`5`	`{`
`6`	`6`	`[TypeConverter(typeof(LocalizationConverter))]`
`7`	`7`	`public enum DecimalSeparator`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`	`using System.Windows;`
`7`	`7`	`using System.Windows.Controls;`
`8`	`8`	`using Mages.Core;`
`9`		`-using Flow.Launcher.Plugin.Caculator.ViewModels;`
`10`		`-using Flow.Launcher.Plugin.Caculator.Views;`
	`9`	`+using Flow.Launcher.Plugin.Calculator.ViewModels;`
	`10`	`+using Flow.Launcher.Plugin.Calculator.Views;`
`11`	`11`
`12`		`-namespace Flow.Launcher.Plugin.Caculator`
	`12`	`+namespace Flow.Launcher.Plugin.Calculator`
`13`	`13`	`{`
`14`	`14`	`public class Main : IPlugin, IPluginI18n, ISettingProvider`
`15`	`15`	`{`
`@@ -62,7 +62,7 @@ public List<Result> Query(Query query)`
`62`	`62`	`switch (_settings.DecimalSeparator)`
`63`	`63`	`{`
`64`	`64`	`case DecimalSeparator.Comma:`
`65`		`- case DecimalSeparator.UseSystemLocale when CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator == ",":`
	`65`	`+ case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":`
`66`	`66`	`expression = query.Search.Replace(",", ".");`
`67`	`67`	`break;`
`68`	`68`	`default:`
`@@ -158,7 +158,7 @@ private string ChangeDecimalSeparator(decimal value, string newDecimalSeparator)`
`158`	`158`
`159`	`159`	`private string GetDecimalSeparator()`
`160`	`160`	`{`
`161`		`- string systemDecimalSeperator = CultureInfo.DefaultThreadCurrentCulture.NumberFormat.NumberDecimalSeparator;`
	`161`	`+ string systemDecimalSeperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;`
`162`	`162`	`switch (_settings.DecimalSeparator)`
`163`	`163`	`{`
`164`	`164`	`case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Text;`
`3`	`3`	`using System.Text.RegularExpressions;`
`4`	`4`
`5`		`-namespace Flow.Launcher.Plugin.Caculator`
	`5`	`+namespace Flow.Launcher.Plugin.Calculator`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Tries to convert all numbers in a text from one culture format to another.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-namespace Flow.Launcher.Plugin.Caculator`
	`2`	`+namespace Flow.Launcher.Plugin.Calculator`
`3`	`3`	`{`
`4`	`4`	`public class Settings`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Linq;`
`3`	`3`
`4`		`-namespace Flow.Launcher.Plugin.Caculator.ViewModels`
	`4`	`+namespace Flow.Launcher.Plugin.Calculator.ViewModels`
`5`	`5`	`{`
`6`	`6`	`public class SettingsViewModel : BaseModel`
`7`	`7`	`{`