Translatable Query Precision Combobox

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -178,8 +178,7 @@ public CustomBrowserViewModel CustomBrowser
         public bool AlwaysStartEn { get; set; } = false;
 
         [JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]
-        public SearchPrecisionScore QuerySearchPrecision { get; private set; } = SearchPrecisionScore.Regular;
-
+        public SearchPrecisionScore QuerySearchPrecision { get;  set; } = SearchPrecisionScore.Regular;
         [JsonIgnore]
         public string QuerySearchPrecisionString
         {

Flow.Launcher/Languages/en.xaml

@@ -77,6 +77,9 @@
     <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">Changes minimum match score required for results.</system:String>
+    <system:String x:Key="SearchPrecisionNone">None</system:String>
+    <system:String x:Key="SearchPrecisionLow">Low</system:String>
+    <system:String x:Key="SearchPrecisionRegular">Regular</system:String>
     <system:String x:Key="ShouldUsePinyin">Search with Pinyin</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese.</system:String>
     <system:String x:Key="AlwaysPreview">Always Preview</system:String>

Flow.Launcher/Languages/ko.xaml

@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Failed to register hotkey &quot;{0}&quot;. The hotkey may be in use by another program. Change to a different hotkey, or exit another program.</system:String>
     <system:String x:Key="MessageBoxTitle">Flow Launcher</system:String>
@@ -75,6 +78,9 @@
     <system:String x:Key="hideNotifyIconToolTip">트레이에서 아이콘을 숨길 경우, 검색창 우클릭으로 설정창을 열 수 있습니다.</system:String>
     <system:String x:Key="querySearchPrecision">쿼리 검색 정밀도</system:String>
     <system:String x:Key="querySearchPrecisionToolTip">검색 결과에 필요한 최소 매치 점수를 변경합니다.</system:String>
+    <system:String x:Key="SearchPrecisionNone">없음</system:String>
+    <system:String x:Key="SearchPrecisionLow">낮음</system:String>
+    <system:String x:Key="SearchPrecisionRegular">일반</system:String>
     <system:String x:Key="ShouldUsePinyin">항상 Pinyin 사용</system:String>
     <system:String x:Key="ShouldUsePinyinToolTip">Pinyin을 사용하여 검색할 수 있습니다. Pinyin (병음) 은 로마자 중국어 입력 방식입니다.</system:String>
     <system:String x:Key="AlwaysPreview">항상 미리보기</system:String>

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

@@ -143,12 +143,26 @@ public bool ShouldUsePinyin
         set => Settings.ShouldUsePinyin = value;
     }
 
-    public List<string> QuerySearchPrecisionStrings => Enum
-        .GetValues(typeof(SearchPrecisionScore))
-        .Cast<SearchPrecisionScore>()
-        .Select(v => v.ToString())
-        .ToList();
-
+    public class SearchPrecisionScoreItem
+    {
+        public string Display { get; set; }
+        public SearchPrecisionScore Value { get; set; }
+    }
+    public List<SearchPrecisionScoreItem> QuerySearchPrecisionItems
+    {
+        get
+        {
+            var items = new List<SearchPrecisionScoreItem>();
+            var values = (SearchPrecisionScore[])Enum.GetValues(typeof(SearchPrecisionScore));
+            foreach (var value in values)
+            {
+                var key = $"SearchPrecision{value}";
+                var display = InternationalizationManager.Instance.GetTranslation(key);
+                items.Add(new SearchPrecisionScoreItem { Display = display, Value = value });
+            }
+            return items;
+        }
+    }
     public List<Language> Languages => InternationalizationManager.Instance.LoadAvailableLanguages();
     public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
 

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

@@ -4,11 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
-    xmlns:ext="clr-namespace:Flow.Launcher.Resources.MarkupExtensions"
     Title="General"
     d:DataContext="{d:DesignInstance settingsViewModels:SettingsPaneGeneralViewModel}"
     d:DesignHeight="450"
@@ -58,58 +58,62 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 30 0 0">
-                <cc:Card Icon="&#xe7f4;" Title="{DynamicResource SearchWindowPosition}">
+                <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             MinWidth="220"
+                            VerticalAlignment="Center"
                             DisplayMemberPath="Display"
-                            SelectedValuePath="Value"
                             FontSize="14"
-                            VerticalAlignment="Center"
                             ItemsSource="{Binding SearchWindowScreens}"
-                            SelectedValue="{Binding Settings.SearchWindowScreen}" />
+                            SelectedValue="{Binding Settings.SearchWindowScreen}"
+                            SelectedValuePath="Value" />
                         <ComboBox
                             MinWidth="160"
                             Margin="18 0 0 0"
-                            FontSize="14"
                             VerticalAlignment="Center"
+                            FontSize="14"
                             ItemsSource="{Binding ScreenNumbers}"
                             SelectedValue="{Binding Settings.CustomScreenNumber}"
-                            Visibility="{ext:VisibleWhen
-                                        {Binding Settings.SearchWindowScreen},
-                                        IsEqualTo={x:Static userSettings:SearchWindowScreens.Custom}}"
-                            />
+                            Visibility="{ext:VisibleWhen {Binding Settings.SearchWindowScreen},
+                                                         IsEqualTo={x:Static userSettings:SearchWindowScreens.Custom}}" />
                     </StackPanel>
                 </cc:Card>
 
                 <cc:Card
-                    Icon="&#xe7f4;"
                     Title="{DynamicResource SearchWindowAlign}"
-                    Visibility="{ext:CollapsedWhen
-                                {Binding Settings.SearchWindowScreen},
-                                IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
+                    Icon="&#xe7f4;"
+                    Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
+                                                   IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
                             MinWidth="160"
+                            VerticalAlignment="Center"
                             DisplayMemberPath="Display"
-                            SelectedValuePath="Value"
                             FontSize="14"
-                            VerticalAlignment="Center"
                             ItemsSource="{Binding SearchWindowAligns}"
-                            SelectedValue="{Binding Settings.SearchWindowAlign}" />
+                            SelectedValue="{Binding Settings.SearchWindowAlign}"
+                            SelectedValuePath="Value" />
 
                         <StackPanel
                             Margin="18 0 0 0"
-                            Orientation="Horizontal"
                             VerticalAlignment="Center"
-                            Visibility="{ext:VisibleWhen
-                                        {Binding Settings.SearchWindowAlign},
-                                        IsEqualTo={x:Static userSettings:SearchWindowAligns.Custom}}">
-                            <TextBox VerticalAlignment="Center" MinWidth="80"
-                                     Text="{Binding Settings.CustomWindowLeft}" />
-                            <TextBlock VerticalAlignment="Center" Margin="10" Text="x" />
-                            <TextBox VerticalAlignment="Center" MinWidth="80" Text="{Binding Settings.CustomWindowTop}"
-                                     TextWrapping="NoWrap" />
+                            Orientation="Horizontal"
+                            Visibility="{ext:VisibleWhen {Binding Settings.SearchWindowAlign},
+                                                         IsEqualTo={x:Static userSettings:SearchWindowAligns.Custom}}">
+                            <TextBox
+                                MinWidth="80"
+                                VerticalAlignment="Center"
+                                Text="{Binding Settings.CustomWindowLeft}" />
+                            <TextBlock
+                                Margin="10"
+                                VerticalAlignment="Center"
+                                Text="x" />
+                            <TextBox
+                                MinWidth="80"
+                                VerticalAlignment="Center"
+                                Text="{Binding Settings.CustomWindowTop}"
+                                TextWrapping="NoWrap" />
                         </StackPanel>
                     </StackPanel>
                 </cc:Card>
@@ -158,24 +162,27 @@
             </cc:Card>
 
             <cc:CardGroup Margin="0 30 0 0">
-                <cc:Card Title="{DynamicResource querySearchPrecision}"
-                         Sub="{DynamicResource querySearchPrecisionToolTip}">
+                <cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
                     <ComboBox
                         MaxWidth="200"
-                        ItemsSource="{Binding QuerySearchPrecisionStrings}"
-                        SelectedItem="{Binding Settings.QuerySearchPrecisionString}" />
+                        DisplayMemberPath="Display"
+                        ItemsSource="{Binding QuerySearchPrecisionItems}"
+                        SelectedValue="{Binding Settings.QuerySearchPrecision, Mode=TwoWay}"
+                        SelectedValuePath="Value" />
                 </cc:Card>
 
                 <cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
                     <ComboBox
                         DisplayMemberPath="Display"
-                        SelectedValuePath="Value"
                         ItemsSource="{Binding LastQueryModes}"
-                        SelectedValue="{Binding Settings.LastQueryMode}" />
+                        SelectedValue="{Binding Settings.LastQueryMode}"
+                        SelectedValuePath="Value" />
                 </cc:Card>
 
-                <cc:Card Icon="&#xe8fd;" Title="{DynamicResource maxShowResults}"
-                         Sub="{DynamicResource maxShowResultsToolTip}">
+                <cc:Card
+                    Title="{DynamicResource maxShowResults}"
+                    Icon="&#xe8fd;"
+                    Sub="{DynamicResource maxShowResultsToolTip}">
                     <ComboBox
                         Width="100"
                         ItemsSource="{Binding MaxResultsRange}"