Change the notification message title about plugin already installed/uninstalled from 'Fail to install ' to ' is already installed'. Do the same for uninstalling notification title.

Jack251970 · Jack251970 · commit 5bfdc583b124 · 2025-07-01T13:18:26.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/PluginInstaller.cs b/Flow.Launcher.Core/Plugin/PluginInstaller.cs
@@ -29,7 +29,7 @@ public static async Task InstallPluginAndCheckRestartAsync(UserPlugin newPlugin)
     {
         if (API.PluginModified(newPlugin.ID))
         {
-            API.ShowMsgError(string.Format(API.GetTranslation("failedToInstallPluginTitle"), newPlugin.Name),
+            API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), newPlugin.Name),
                     API.GetTranslation("pluginModifiedAlreadyMessage"));
             return;
         }
@@ -129,7 +129,7 @@ public static async Task InstallPluginAndCheckRestartAsync(string filePath)
 
         if (API.PluginModified(plugin.ID))
         {
-            API.ShowMsgError(string.Format(API.GetTranslation("failedToInstallPluginTitle"), plugin.Name),
+            API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), plugin.Name),
                     API.GetTranslation("pluginModifiedAlreadyMessage"));
             return;
         }
@@ -151,7 +151,7 @@ public static async Task UninstallPluginAndCheckRestartAsync(PluginMetadata oldP
     {
         if (API.PluginModified(oldPlugin.ID))
         {
-            API.ShowMsgError(string.Format(API.GetTranslation("failedToUninstallPluginTitle"), oldPlugin.Name),
+            API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), oldPlugin.Name),
                     API.GetTranslation("pluginModifiedAlreadyMessage"));
             return;
         }
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -568,7 +568,7 @@ internal static bool InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
         {
             if (checkModified && PluginModified(plugin.ID))
             {
-                API.ShowMsgError(string.Format(API.GetTranslation("failedToInstallPluginTitle"), plugin.Name),
+                API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), plugin.Name),
                     API.GetTranslation("pluginModifiedAlreadyMessage"));
                 return false;
             }
@@ -649,7 +649,7 @@ internal static async Task<bool> UninstallPluginAsync(PluginMetadata plugin, boo
         {
             if (checkModified && PluginModified(plugin.ID))
             {
-                API.ShowMsgError(string.Format(API.GetTranslation("failedToUninstallPluginTitle"), plugin.Name),
+                API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), plugin.Name),
                     API.GetTranslation("pluginModifiedAlreadyMessage"));
                 return false;
             }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -175,9 +175,10 @@
     <system:String x:Key="failedToRemovePluginSettingsMessage">Plugins: {0} - Fail to remove plugin settings files, please remove them manually</system:String>
     <system:String x:Key="failedToRemovePluginCacheTitle">Fail to remove plugin cache</system:String>
     <system:String x:Key="failedToRemovePluginCacheMessage">Plugins: {0} - Fail to remove plugin cache files, please remove them manually</system:String>
+    <system:String x:Key="pluginModifiedAlreadyTitle">Plugin {0} is installed or uninstalled already</system:String>
+    <system:String x:Key="pluginModifiedAlreadyMessage">Please restart Flow before making any further changes</system:String>
     <system:String x:Key="failedToInstallPluginTitle">Fail to install {0}</system:String>
     <system:String x:Key="failedToUninstallPluginTitle">Fail to uninstall {0}</system:String>
-    <system:String x:Key="pluginModifiedAlreadyMessage">This plugin has been installed or uninstalled already, please restart Flow</system:String>
     <system:String x:Key="fileNotFoundMessage">Unable to find plugin.json from the extracted zip file, or this path {0} does not exist</system:String>
     <system:String x:Key="pluginExistAlreadyMessage">A plugin with the same ID and version already exists, or the version is greater than this downloaded plugin</system:String>
 
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -45,6 +45,8 @@
     <system:String x:Key="plugin_pluginsmanager_update_success_no_restart">Plugin {0} successfully updated. Please restart Flow.</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_all_success_no_restart">{0} plugins successfully updated. Please restart Flow.</system:String>
     <system:String x:Key="plugin_pluginsmanager_plugin_modified_error">Plugin {0} has already been modified. Please restart Flow before making any further changes.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_plugin_modified_error_title">Plugin {0} has already been modified</system:String>
+    <system:String x:Key="plugin_pluginsmanager_plugin_modified_error_message">Please restart Flow before making any further changes</system:String>
 
     <system:String x:Key="plugin_pluginsmanager_invalid_zip_title">Invalid zip installer file</system:String>
     <system:String x:Key="plugin_pluginsmanager_invalid_zip_subtitle">Please check if there is a plugin.json in {0}</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -116,9 +116,9 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
             if (Context.API.PluginModified(plugin.ID))
             {
-                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
-                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error"),
-                        plugin.Name));
+                Context.API.ShowMsgError(
+                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_title"), plugin.Name),
+                    Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_message"));
                 return;
             }
 
@@ -314,9 +314,9 @@ where string.Compare(existingPlugin.Metadata.Version, pluginUpdateSource.Version
                         {
                             if (Context.API.PluginModified(x.ID))
                             {
-                                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
-                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error"),
-                                        x.Name));
+                                Context.API.ShowMsgError(
+                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_title"), x.Name),
+                                    Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_message"));
                                 return false;
                             }
 
@@ -765,6 +765,14 @@ internal List<Result> RequestUninstall(string search)
                         IcoPath = x.Metadata.IcoPath,
                         AsyncAction = async e =>
                         {
+                            if (Context.API.PluginModified(x.Metadata.ID))
+                            {
+                                Context.API.ShowMsgError(
+                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_title"), x.Metadata.Name),
+                                    Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_message"));
+                                return false;
+                            }
+
                             string message;
                             if (Settings.AutoRestartAfterChanging)
                             {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static async Task InstallPluginAndCheckRestartAsync(UserPlugin newPlugin)`
`29`	`29`	`{`
`30`	`30`	`if (API.PluginModified(newPlugin.ID))`
`31`	`31`	`{`
`32`		`- API.ShowMsgError(string.Format(API.GetTranslation("failedToInstallPluginTitle"), newPlugin.Name),`
	`32`	`+ API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), newPlugin.Name),`
`33`	`33`	`API.GetTranslation("pluginModifiedAlreadyMessage"));`
`34`	`34`	`return;`
`35`	`35`	`}`
`@@ -129,7 +129,7 @@ public static async Task InstallPluginAndCheckRestartAsync(string filePath)`
`129`	`129`
`130`	`130`	`if (API.PluginModified(plugin.ID))`
`131`	`131`	`{`
`132`		`- API.ShowMsgError(string.Format(API.GetTranslation("failedToInstallPluginTitle"), plugin.Name),`
	`132`	`+ API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), plugin.Name),`
`133`	`133`	`API.GetTranslation("pluginModifiedAlreadyMessage"));`
`134`	`134`	`return;`
`135`	`135`	`}`
`@@ -151,7 +151,7 @@ public static async Task UninstallPluginAndCheckRestartAsync(PluginMetadata oldP`
`151`	`151`	`{`
`152`	`152`	`if (API.PluginModified(oldPlugin.ID))`
`153`	`153`	`{`
`154`		`- API.ShowMsgError(string.Format(API.GetTranslation("failedToUninstallPluginTitle"), oldPlugin.Name),`
	`154`	`+ API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), oldPlugin.Name),`
`155`	`155`	`API.GetTranslation("pluginModifiedAlreadyMessage"));`
`156`	`156`	`return;`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ internal static bool InstallPlugin(UserPlugin plugin, string zipFilePath, bool c`
`568`	`568`	`{`
`569`	`569`	`if (checkModified && PluginModified(plugin.ID))`
`570`	`570`	`{`
`571`		`- API.ShowMsgError(string.Format(API.GetTranslation("failedToInstallPluginTitle"), plugin.Name),`
	`571`	`+ API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), plugin.Name),`
`572`	`572`	`API.GetTranslation("pluginModifiedAlreadyMessage"));`
`573`	`573`	`return false;`
`574`	`574`	`}`
`@@ -649,7 +649,7 @@ internal static async Task<bool> UninstallPluginAsync(PluginMetadata plugin, boo`
`649`	`649`	`{`
`650`	`650`	`if (checkModified && PluginModified(plugin.ID))`
`651`	`651`	`{`
`652`		`- API.ShowMsgError(string.Format(API.GetTranslation("failedToUninstallPluginTitle"), plugin.Name),`
	`652`	`+ API.ShowMsgError(string.Format(API.GetTranslation("pluginModifiedAlreadyTitle"), plugin.Name),`
`653`	`653`	`API.GetTranslation("pluginModifiedAlreadyMessage"));`
`654`	`654`	`return false;`
`655`	`655`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)`
`116`	`116`
`117`	`117`	`if (Context.API.PluginModified(plugin.ID))`
`118`	`118`	`{`
`119`		`- Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),`
`120`		`- string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error"),`
`121`		`- plugin.Name));`
	`119`	`+ Context.API.ShowMsgError(`
	`120`	`+ string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_title"), plugin.Name),`
	`121`	`+ Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_message"));`
`122`	`122`	`return;`
`123`	`123`	`}`
`124`	`124`
`@@ -314,9 +314,9 @@ where string.Compare(existingPlugin.Metadata.Version, pluginUpdateSource.Version`
`314`	`314`	`{`
`315`	`315`	`if (Context.API.PluginModified(x.ID))`
`316`	`316`	`{`
`317`		`- Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),`
`318`		`- string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error"),`
`319`		`- x.Name));`
	`317`	`+ Context.API.ShowMsgError(`
	`318`	`+ string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_title"), x.Name),`
	`319`	`+ Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_message"));`
`320`	`320`	`return false;`
`321`	`321`	`}`
`322`	`322`
`@@ -765,6 +765,14 @@ internal List<Result> RequestUninstall(string search)`
`765`	`765`	`IcoPath = x.Metadata.IcoPath,`
`766`	`766`	`AsyncAction = async e =>`
`767`	`767`	`{`
	`768`	`+ if (Context.API.PluginModified(x.Metadata.ID))`
	`769`	`+ {`
	`770`	`+ Context.API.ShowMsgError(`
	`771`	`+ string.Format(Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_title"), x.Metadata.Name),`
	`772`	`+ Context.API.GetTranslation("plugin_pluginsmanager_plugin_modified_error_message"));`
	`773`	`+ return false;`
	`774`	`+ }`
	`775`	`+`
`768`	`776`	`string message;`
`769`	`777`	`if (Settings.AutoRestartAfterChanging)`
`770`	`778`	`{`