From 456ba61d30f668eaf9cdcaff6f8b107118412f2a Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Sat, 11 Dec 2021 12:28:11 -0600 Subject: [PATCH] Remove Area Subtitle in WindowsSettings issue & call OnCultureInfoChanged when changing language --- Flow.Launcher.Core/Resource/Internationalization.cs | 4 ++-- .../Helper/ResultHelper.cs | 1 - Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs index 374f7c71f..48eee7308 100644 --- a/Flow.Launcher.Core/Resource/Internationalization.cs +++ b/Flow.Launcher.Core/Resource/Internationalization.cs @@ -176,12 +176,12 @@ namespace Flow.Launcher.Core.Resource { foreach (var p in PluginManager.GetPluginsForInterface()) { - var pluginI18N = p.Plugin as IPluginI18n; - if (pluginI18N == null) return; + if (p.Plugin is not IPluginI18n pluginI18N) continue; try { p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle(); p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription(); + pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture); } catch (Exception e) { diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs index ca3b06b8d..3005567c4 100644 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs @@ -54,7 +54,6 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper if (areaMatch.IsSearchPrecisionScoreMet()) { var settingResult = NewSettingResult(areaMatch.Score + midScore, entry.Type); - settingResult.SubTitleHighlightData = areaMatch.MatchData.Select(x => x + 6).ToList(); result = settingResult; } else diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs index cbcca03ae..c42386e03 100644 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs @@ -90,7 +90,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings /// The query to filter the list. /// A filtered list, can be empty when nothing was found. public List Query(Query query) - { + { var newList = ResultHelper.GetResultList(_translatedSettingList, query, windowSettingsIconPath, controlPanelIconPath); return newList; } @@ -147,4 +147,4 @@ namespace Flow.Launcher.Plugin.WindowsSettings return Description; } } -} +} \ No newline at end of file