Add extension name and id to uninstall message

Co-authored-by: ReLater
joomla · May 4, 2020 · fe21b71 · fe21b71
1 parent f02c9cc
commit fe21b71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -253,7 +253,7 @@ public function remove($eid = array())
 			// Do not allow to uninstall locked extensions.
 			if ((int) $row->locked === 1)
 			{
-				$msgs[] = Text::_('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION');
+				$msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION', $row->name, $id);
 
 				continue;
 			}

diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
@@ -249,7 +249,7 @@ COM_INSTALLER_TYPE_TYPE_TEMPLATE="template"
 COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package"
 COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The Joomla package cannot be installed through the Extension Manager. Please use the <a href='%s'>Joomla! Update</a> component to update Joomla."
 COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s."
-COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="Locked extensions cannot be uninstalled."
+COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="The extension \"%1s\" (ID %2s) is locked and cannot be uninstalled."
 COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for an update ID, update site ID or extension ID."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_LABEL="Search Extensions with Updates"

diff --git a/libraries/src/Console/ExtensionRemoveCommand.php b/libraries/src/Console/ExtensionRemoveCommand.php
@@ -172,7 +172,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
 			// Do not allow to uninstall locked extensions.
 			if ((int) $row->locked === 1)
 			{
-				$this->ioStyle->error(Text::_('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION'));
+				$this->ioStyle->error(Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION', $row->name, $extensionId));
 
 				return self::REMOVE_LOCKED;
 			}