Use Flow.Launcher.Localization to improve code quality

Author: Jack251970

Flow.Launcher.Core/Configuration/Portable.cs

@@ -45,7 +45,7 @@ public void DisablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.PortableDataPath);
 
-                API.ShowMsgBox(API.GetTranslation("restartToDisablePortableMode"));
+                API.ShowMsgBox(Localize.restartToDisablePortableMode());
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
@@ -68,7 +68,7 @@ public void EnablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.RoamingDataPath);
 
-                API.ShowMsgBox(API.GetTranslation("restartToEnablePortableMode"));
+                API.ShowMsgBox(Localize.restartToEnablePortableMode());
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
@@ -152,7 +152,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             {
                 FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => API.ShowMsgBox(s));
 
-                if (API.ShowMsgBox(API.GetTranslation("moveToDifferentLocation"), 
+                if (API.ShowMsgBox(Localize.moveToDifferentLocation(), 
                     string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     FilesFolders.OpenPath(Constant.RootDirectory, (s) => API.ShowMsgBox(s));
@@ -166,7 +166,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             {
                 FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => API.ShowMsgBox(s));
 
-                API.ShowMsgBox(API.GetTranslation("shortcutsUninstallerCreated"));
+                API.ShowMsgBox(Localize.shortcutsUninstallerCreated());
             }
         }
 
@@ -177,8 +177,7 @@ public bool CanUpdatePortability()
 
             if (roamingLocationExists && portableLocationExists)
             {
-                API.ShowMsgBox(string.Format(API.GetTranslation("userDataDuplicated"), 
-                    DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
+                API.ShowMsgBox(Localize.userDataDuplicated(DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
 
                 return false;
             }

Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs

@@ -58,15 +58,10 @@ internal IEnumerable<PluginPair> Setup()
                 return SetPathForPluginPairs(PluginsSettingsFilePath, Language);
             }
 
-            var noRuntimeMessage = string.Format(
-                API.GetTranslation("runtimePluginInstalledChooseRuntimePrompt"),
-                Language,
-                EnvName,
-                Environment.NewLine
-            );
+            var noRuntimeMessage = Localize.runtimePluginInstalledChooseRuntimePrompt(Language, EnvName, Environment.NewLine);
             if (API.ShowMsgBox(noRuntimeMessage, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
             {
-                var msg = string.Format(API.GetTranslation("runtimePluginChooseRuntimeExecutable"), EnvName);
+                var msg = Localize.runtimePluginChooseRuntimeExecutable(EnvName);
 
                 var selectedFile = GetFileFromDialog(msg, FileDialogFilter);
 
@@ -77,12 +72,7 @@ internal IEnumerable<PluginPair> Setup()
                 // Nothing selected because user pressed cancel from the file dialog window
                 else
                 {
-                    var forceDownloadMessage = string.Format(
-                        API.GetTranslation("runtimeExecutableInvalidChooseDownload"),
-                        Language,
-                        EnvName,
-                        Environment.NewLine
-                    );
+                    var forceDownloadMessage = Localize.runtimeExecutableInvalidChooseDownload(Language, EnvName, Environment.NewLine);
 
                     // Let users select valid path or choose to download
                     while (string.IsNullOrEmpty(selectedFile))
@@ -120,7 +110,7 @@ internal IEnumerable<PluginPair> Setup()
             }
             else
             {
-                API.ShowMsgBox(string.Format(API.GetTranslation("runtimePluginUnableToSetExecutablePath"), Language));
+                API.ShowMsgBox(Localize.runtimePluginUnableToSetExecutablePath(Language));
                 API.LogError(ClassName,
                     $"Not able to successfully set {EnvName} path, setting's plugin executable path variable is still an empty string.",
                     $"{Language}Environment");

Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs

@@ -51,7 +51,7 @@ internal override void InstallEnvironment()
                 }
                 catch (System.Exception e)
                 {
-                    API.ShowMsgError(API.GetTranslation("failToInstallPythonEnv"));
+                    API.ShowMsgError(Localize.failToInstallPythonEnv());
                     API.LogException(ClassName, "Failed to install Python environment", e);
                 }
             });

Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptEnvironment.cs

@@ -46,7 +46,7 @@ internal override void InstallEnvironment()
                 }
                 catch (System.Exception e)
                 {
-                    API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
+                    API.ShowMsgError(Localize.failToInstallTypeScriptEnv());
                     API.LogException(ClassName, "Failed to install TypeScript environment", e);
                 }
             });

Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptV2Environment.cs

@@ -46,7 +46,7 @@ internal override void InstallEnvironment()
                 }
                 catch (System.Exception e)
                 {
-                    API.ShowMsgError(API.GetTranslation("failToInstallTypeScriptEnv"));
+                    API.ShowMsgError(Localize.failToInstallTypeScriptEnv());
                     API.LogException(ClassName, "Failed to install TypeScript environment", e);
                 }
             });

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net9.0-windows</TargetFramework>
@@ -34,6 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>$(NoWarn);FLSG0007</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -55,13 +56,25 @@
 
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.7.0" />
+    <PackageReference Include="Flow.Launcher.Localization" Version="0.0.6" />
     <PackageReference Include="FSharp.Core" Version="9.0.303" />
     <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.4" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
     <PackageReference Include="StreamJsonRpc" Version="2.22.11" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <FLLUseDependencyInjection>true</FLLUseDependencyInjection>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Remove="Languages\en.xaml" />
+    <AdditionalFiles Include="..\Flow.Launcher\Languages\en.xaml">
+      <Link>Languages\en.xaml</Link>
+    </AdditionalFiles>
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -285,7 +285,7 @@ public Control CreateSettingPanel()
                                 HorizontalAlignment = HorizontalAlignment.Left,
                                 VerticalAlignment = VerticalAlignment.Center,
                                 Margin = SettingPanelItemLeftMargin,
-                                Content = API.GetTranslation("select")
+                                Content = Localize.select()
                             };
 
                             Btn.Click += (_, _) =>