Merge pull request Flow-Launcher#3849 from Flow-Launcher/translations

jjw24 · TBM13 · commit 3d8b7325ccc0 · 2025-07-27T21:15:07.000-03:00
Add Translations for All Messages and Message Boxes
diff --git a/Flow.Launcher.Core/Plugin/PluginsLoader.cs b/Flow.Launcher.Core/Plugin/PluginsLoader.cs
@@ -100,15 +100,15 @@ private static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source
             {
                 var errorPluginString = string.Join(Environment.NewLine, erroredPlugins);
 
-                var errorMessage = "The following "
-                                   + (erroredPlugins.Count > 1 ? "plugins have " : "plugin has ")
-                                   + "errored and cannot be loaded:";
+                var errorMessage = erroredPlugins.Count > 1 ?
+                    API.GetTranslation("pluginsHaveErrored") :
+                    API.GetTranslation("pluginHasErrored");
 
                 _ = Task.Run(() =>
                 {
-                    Ioc.Default.GetRequiredService<IPublicAPI>().ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
+                    API.ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
                                     $"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
-                                    $"Please refer to the logs for more information", "",
+                                    API.GetTranslation("referToLogs"), string.Empty,
                         MessageBoxButton.OK, MessageBoxImage.Warning);
                 });
             }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Languages/en.xaml
@@ -1,6 +1,7 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:String x:Key="flowlauncher_plugin_caculator_plugin_name">Calculator</system:String>
     <system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Flow Launcher)</system:String>
@@ -11,4 +12,5 @@
     <system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_comma">Comma (,)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_dot">Dot (.)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_max_decimal_places">Max. decimal places</system:String>
+    <system:String x:Key="flowlauncher_plugin_calculator_failed_to_copy">Copy failed, please try later</system:String>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -93,7 +93,7 @@ public List<Result> Query(Query query)
                                 }
                                 catch (ExternalException)
                                 {
-                                    Context.API.ShowMsgBox("Copy failed, please try later");
+                                    Context.API.ShowMsgBox(Context.API.GetTranslation("flowlauncher_plugin_calculator_failed_to_copy"));
                                     return false;
                                 }
                             }
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -445,7 +445,7 @@ public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, Proc
                 var title = Context.API.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_error");
                 var message = string.Format(Context.API.GetTranslation("flowlauncher_plugin_program_run_failed"),
                     info.FileName);
-                Context.API.ShowMsg(title, string.Format(message, info.FileName), string.Empty);
+                Context.API.ShowMsgError(title, message);
             }
         }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs
@@ -462,7 +462,7 @@ public Result Result(string query, IPublicAPI api)
                         var message =
                             api.GetTranslation(
                                 "flowlauncher_plugin_program_run_as_administrator_not_supported_message");
-                        api.ShowMsg(title, message, string.Empty);
+                        api.ShowMsgError(title, message);
                     }
 
                     return true;
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Shell/Languages/en.xaml
@@ -1,6 +1,7 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:String x:Key="flowlauncher_plugin_cmd_close_cmd_after_press">Close Command Prompt after pressing any key</system:String>
     <system:String x:Key="flowlauncher_plugin_cmd_press_any_key_to_close">Press any key to close this window...</system:String>
@@ -15,4 +16,6 @@
     <system:String x:Key="flowlauncher_plugin_cmd_run_as_administrator">Run As Administrator</system:String>
     <system:String x:Key="flowlauncher_plugin_cmd_copy">Copy the command</system:String>
     <system:String x:Key="flowlauncher_plugin_cmd_history">Only show number of most used commands:</system:String>
+    <system:String x:Key="flowlauncher_plugin_cmd_command_not_found">Command not found: {0}</system:String>
+    <system:String x:Key="flowlauncher_plugin_cmd_error_running_command">Error running the command: {0}</system:String>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Main.cs b/Plugins/Flow.Launcher.Plugin.Shell/Main.cs
@@ -329,15 +329,17 @@ private void Execute(Func<ProcessStartInfo, Process> startProcess, ProcessStartI
             }
             catch (FileNotFoundException e)
             {
-                var name = "Plugin: Shell";
-                var message = $"Command not found: {e.Message}";
-                Context.API.ShowMsg(name, message);
+                Context.API.ShowMsgError(GetTranslatedPluginTitle(),
+                    string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_command_not_found"), e.Message));
             }
             catch (Win32Exception e)
             {
-                var name = "Plugin: Shell";
-                var message = $"Error running the command: {e.Message}";
-                Context.API.ShowMsg(name, message);
+                Context.API.ShowMsgError(GetTranslatedPluginTitle(),
+                    string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_error_running_command"), e.Message));
+            }
+            catch (Exception e)
+            {
+                Context.API.LogException(ClassName, $"Error executing command: {info.FileName} {string.Join(" ", info.ArgumentList)}", e);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -100,15 +100,15 @@ private static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source`
`100`	`100`	`{`
`101`	`101`	`var errorPluginString = string.Join(Environment.NewLine, erroredPlugins);`
`102`	`102`
`103`		`- var errorMessage = "The following "`
`104`		`- + (erroredPlugins.Count > 1 ? "plugins have " : "plugin has ")`
`105`		`- + "errored and cannot be loaded:";`
	`103`	`+ var errorMessage = erroredPlugins.Count > 1 ?`
	`104`	`+ API.GetTranslation("pluginsHaveErrored") :`
	`105`	`+ API.GetTranslation("pluginHasErrored");`
`106`	`106`
`107`	`107`	`_ = Task.Run(() =>`
`108`	`108`	`{`
`109`		`- Ioc.Default.GetRequiredService<IPublicAPI>().ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +`
	`109`	`+ API.ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +`
`110`	`110`	`$"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +`
`111`		`- $"Please refer to the logs for more information", "",`
	`111`	`+ API.GetTranslation("referToLogs"), string.Empty,`
`112`	`112`	`MessageBoxButton.OK, MessageBoxImage.Warning);`
`113`	`113`	`});`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public List<Result> Query(Query query)`
`93`	`93`	`}`
`94`	`94`	`catch (ExternalException)`
`95`	`95`	`{`
`96`		`- Context.API.ShowMsgBox("Copy failed, please try later");`
	`96`	`+ Context.API.ShowMsgBox(Context.API.GetTranslation("flowlauncher_plugin_calculator_failed_to_copy"));`
`97`	`97`	`return false;`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, Proc`
`445`	`445`	`var title = Context.API.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_error");`
`446`	`446`	`var message = string.Format(Context.API.GetTranslation("flowlauncher_plugin_program_run_failed"),`
`447`	`447`	`info.FileName);`
`448`		`- Context.API.ShowMsg(title, string.Format(message, info.FileName), string.Empty);`
	`448`	`+ Context.API.ShowMsgError(title, message);`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ public Result Result(string query, IPublicAPI api)`
`462`	`462`	`var message =`
`463`	`463`	`api.GetTranslation(`
`464`	`464`	`"flowlauncher_plugin_program_run_as_administrator_not_supported_message");`
`465`		`- api.ShowMsg(title, message, string.Empty);`
	`465`	`+ api.ShowMsgError(title, message);`
`466`	`466`	`}`
`467`	`467`
`468`	`468`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -329,15 +329,17 @@ private void Execute(Func<ProcessStartInfo, Process> startProcess, ProcessStartI`
`329`	`329`	`}`
`330`	`330`	`catch (FileNotFoundException e)`
`331`	`331`	`{`
`332`		`- var name = "Plugin: Shell";`
`333`		`- var message = $"Command not found: {e.Message}";`
`334`		`- Context.API.ShowMsg(name, message);`
	`332`	`+ Context.API.ShowMsgError(GetTranslatedPluginTitle(),`
	`333`	`+ string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_command_not_found"), e.Message));`
`335`	`334`	`}`
`336`	`335`	`catch (Win32Exception e)`
`337`	`336`	`{`
`338`		`- var name = "Plugin: Shell";`
`339`		`- var message = $"Error running the command: {e.Message}";`
`340`		`- Context.API.ShowMsg(name, message);`
	`337`	`+ Context.API.ShowMsgError(GetTranslatedPluginTitle(),`
	`338`	`+ string.Format(Context.API.GetTranslation("flowlauncher_plugin_cmd_error_running_command"), e.Message));`
	`339`	`+ }`
	`340`	`+ catch (Exception e)`
	`341`	`+ {`
	`342`	`+ Context.API.LogException(ClassName, $"Error executing command: {info.FileName} {string.Join(" ", info.ArgumentList)}", e);`
`341`	`343`	`}`
`342`	`344`	`}`
`343`	`345`