Skip to content

Commit 224b1df

Browse files
Translate BuiltinShortcut desc
1 parent 019019e commit 224b1df

File tree

5 files changed

+30
-7
lines changed

5 files changed

+30
-7
lines changed

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public string QuerySearchPrecisionString
190190

191191
[JsonIgnore]
192192
public ObservableCollection<BuiltinShortcutModel> BuiltinShortcuts { get; set; } = new ObservableCollection<BuiltinShortcutModel>() {
193-
new BuiltinShortcutModel("{clipboard}", "Get text from clipboard.", Clipboard.GetText) // TODO: translation?
193+
new BuiltinShortcutModel("{clipboard}", "shortcut_clipboard_description", Clipboard.GetText)
194194
};
195195

196196
public bool DontPromptUpdateMsg { get; set; }
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Globalization;
3+
using System.Windows.Data;
4+
using Flow.Launcher.Core.Resource;
5+
6+
namespace Flow.Launcher.Converters
7+
{
8+
public class TranlationConverter : IValueConverter
9+
{
10+
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
11+
{
12+
var key = value.ToString();
13+
if (String.IsNullOrEmpty(key))
14+
return key;
15+
return InternationalizationManager.Instance.GetTranslation(key);
16+
}
17+
18+
public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
19+
}
20+
}

Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
<system:String x:Key="customQuery">Query</system:String>
149149
<system:String x:Key="customShortcut">Shortcut</system:String>
150150
<system:String x:Key="customShortcutExpansion">Expanded</system:String>
151+
<system:String x:Key="builtinShortcutDescription">Description</system:String>
151152
<system:String x:Key="delete">Delete</system:String>
152153
<system:String x:Key="edit">Edit</system:String>
153154
<system:String x:Key="add">Add</system:String>

Flow.Launcher/SettingWindow.xaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<converters:BorderClipConverter x:Key="BorderClipConverter" />
4242
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
4343
<converters:TextConverter x:Key="TextConverter" />
44+
<converters:TranlationConverter x:Key="TranlationConverter" />
4445
<CollectionViewSource x:Key="SortedFonts" Source="{Binding Source={x:Static Fonts.SystemFontFamilies}}">
4546
<CollectionViewSource.SortDescriptions>
4647
<scm:SortDescription PropertyName="Source" />
@@ -2531,14 +2532,14 @@
25312532
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
25322533
<ListView.View>
25332534
<GridView>
2534-
<GridViewColumn Header="{DynamicResource customShortcut}">
2535+
<GridViewColumn Width="180" Header="{DynamicResource customShortcut}">
25352536
<GridViewColumn.CellTemplate>
25362537
<DataTemplate>
25372538
<TextBlock Text="{Binding Key}" />
25382539
</DataTemplate>
25392540
</GridViewColumn.CellTemplate>
25402541
</GridViewColumn>
2541-
<GridViewColumn Header="{DynamicResource customShortcutExpansion}">
2542+
<GridViewColumn Width="540" Header="{DynamicResource customShortcutExpansion}">
25422543
<GridViewColumn.CellTemplate>
25432544
<DataTemplate>
25442545
<TextBlock Text="{Binding Value}" />
@@ -2586,21 +2587,21 @@
25862587
Background="{DynamicResource Color02B}"
25872588
BorderBrush="DarkGray"
25882589
BorderThickness="1"
2589-
ItemsSource="{Binding Settings.BuiltinShortcuts}"
2590+
ItemsSource="{Binding BuiltinShortcuts}"
25902591
Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
25912592
<ListView.View>
25922593
<GridView>
2593-
<GridViewColumn Header="{DynamicResource customShortcut}">
2594+
<GridViewColumn Width="180" Header="{DynamicResource customShortcut}">
25942595
<GridViewColumn.CellTemplate>
25952596
<DataTemplate>
25962597
<TextBlock Text="{Binding Key}" />
25972598
</DataTemplate>
25982599
</GridViewColumn.CellTemplate>
25992600
</GridViewColumn>
2600-
<GridViewColumn Header="Description">
2601+
<GridViewColumn Width="540" Header="{DynamicResource builtinShortcutDescription}">
26012602
<GridViewColumn.CellTemplate>
26022603
<DataTemplate>
2603-
<TextBlock Text="{Binding Description}" />
2604+
<TextBlock Text="{Binding Description, Converter={StaticResource TranlationConverter}}" />
26042605
</DataTemplate>
26052606
</GridViewColumn.CellTemplate>
26062607
</GridViewColumn>

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ public List<string> QuerySearchPrecisionStrings
224224
public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
225225

226226
public ObservableCollection<CustomShortcutModel> CustomShortcuts => Settings.CustomShortcuts;
227+
public ObservableCollection<BuiltinShortcutModel> BuiltinShortcuts => Settings.BuiltinShortcuts;
227228

228229
public string TestProxy()
229230
{

0 commit comments

Comments
 (0)