From 230e4fbcbbcae1d2025f361fb2d354dd17452396 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Wed, 21 Dec 2022 15:51:53 +0800 Subject: [PATCH] Fix translation of action keywords --- Flow.Launcher/SettingWindow.xaml | 3 ++- .../ViewModels/SettingsViewModel.cs | 10 +++++----- .../Views/ExplorerSettings.xaml | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 0a786d89e..ebca70462 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -5,6 +5,7 @@ xmlns:converters="clr-namespace:Flow.Launcher.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:flowlauncher="clr-namespace:Flow.Launcher" + xmlns:core="clr-namespace:Flow.Launcher.Core.Resource;assembly=Flow.Launcher.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase" xmlns:sys="clr-namespace:System;assembly=mscorlib" @@ -42,7 +43,7 @@ - + diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs index 5975d3f16..67bf8d928 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs @@ -112,15 +112,15 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels ActionKeywordsModels = new List { new(Settings.ActionKeyword.SearchActionKeyword, - Context.API.GetTranslation("plugin_explorer_actionkeywordview_search")), + "plugin_explorer_actionkeywordview_search"), new(Settings.ActionKeyword.FileContentSearchActionKeyword, - Context.API.GetTranslation("plugin_explorer_actionkeywordview_filecontentsearch")), + "plugin_explorer_actionkeywordview_filecontentsearch"), new(Settings.ActionKeyword.PathSearchActionKeyword, - Context.API.GetTranslation("plugin_explorer_actionkeywordview_pathsearch")), + "plugin_explorer_actionkeywordview_pathsearch"), new(Settings.ActionKeyword.IndexSearchActionKeyword, - Context.API.GetTranslation("plugin_explorer_actionkeywordview_indexsearch")), + "plugin_explorer_actionkeywordview_indexsearch"), new(Settings.ActionKeyword.QuickAccessActionKeyword, - Context.API.GetTranslation("plugin_explorer_actionkeywordview_quickaccess")) + "plugin_explorer_actionkeywordview_quickaccess") }; } diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml index 6b2877bf5..ab0b01d30 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converters="clr-namespace:Flow.Launcher.Plugin.Explorer.Views.Converters" + 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:qa="clr-namespace:Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks" @@ -106,12 +107,13 @@ + + Text="{Binding Description, Mode=OneTime, Converter={StaticResource TranslationConverter}}">