Merge pull request #781 from Flow-Launcher/translation_new_api

Add OnCultureInfoChanged to IPluginI18n

Author: jjw24

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -10,6 +10,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using System.Globalization;
+using System.Threading.Tasks;
 
 namespace Flow.Launcher.Core.Resource
 {
@@ -95,10 +96,13 @@ public void ChangeLanguage(Language language)
             {
                 LoadLanguage(language);
             }
-            UpdatePluginMetadataTranslations();
             Settings.Language = language.LanguageCode;
             CultureInfo.CurrentCulture = new CultureInfo(language.LanguageCode);
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
+            Task.Run(() =>
+            {
+                UpdatePluginMetadataTranslations();
+            });
         }
 
         public bool PromptShouldUsePinyin(string languageCodeToSet)

Flow.Launcher.Plugin/Interfaces/IPluginI18n.cs

@@ -1,4 +1,6 @@
-namespace Flow.Launcher.Plugin
+using System.Globalization;
+
+namespace Flow.Launcher.Plugin
 {
     /// <summary>
     /// Represent plugins that support internationalization
@@ -8,5 +10,13 @@ public interface IPluginI18n : IFeatures
         string GetTranslatedPluginTitle();
 
         string GetTranslatedPluginDescription();
+
+        /// <summary>
+        /// The method will be invoked when language of flow changed
+        /// </summary>
+        void OnCultureInfoChanged(CultureInfo newCulture)
+        {
+
+        }
     }
 }

Plugins/Flow.Launcher.Plugin.WindowsSettings/Classes/WindowsSetting.cs

@@ -9,7 +9,7 @@ namespace Flow.Plugin.WindowsSettings.Classes
     /// <summary>
     /// A windows setting
     /// </summary>
-    internal class WindowsSetting
+    internal record WindowsSetting
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="WindowsSetting"/> class.

Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs

@@ -150,12 +150,8 @@ private static bool DoOpenSettingsAction(WindowsSetting entry)
             ProcessStartInfo processStartInfo;
 
             var command = entry.Command;
-
-            if (command.Contains("%windir%", StringComparison.InvariantCultureIgnoreCase))
-            {
-                var windowsFolder = Environment.GetFolderPath(Environment.SpecialFolder.Windows);
-                command = command.Replace("%windir%", windowsFolder, StringComparison.InvariantCultureIgnoreCase);
-            }
+            
+            command = Environment.ExpandEnvironmentVariables(command);
 
             if (command.Contains(' '))
             {

Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/TranslationHelper.cs

@@ -80,7 +80,7 @@ internal static IEnumerable<WindowsSetting> TranslateAllSettings(in IEnumerable<
                     }
 
                 }
-                var translatedSetting = new WindowsSetting
+                var translatedSetting = settings with
                 {
                     Area = area ?? settings.Area,
                     Name = name ?? settings.Name,

Plugins/Flow.Launcher.Plugin.WindowsSettings/Main.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Reflection;
 using Flow.Launcher.Plugin;
 using Flow.Plugin.WindowsSettings.Classes;
@@ -106,6 +107,11 @@ public List<Result> Query(Query query)
 
         }
 
+        public void OnCultureInfoChanged(CultureInfo newCulture)
+        {
+            _translatedSettingList = TranslationHelper.TranslateAllSettings(_settingsList);
+        }
+
         /// <summary>
         /// Return a list context menu entries for a given <see cref="Result"/> (shown at the right side of the result).
         /// </summary>