From d374945f0bb708f6adfcd9fac737ad5c4f43d56c Mon Sep 17 00:00:00 2001 From: Fedir Zinchuk Date: Wed, 13 Sep 2023 16:29:13 +0300 Subject: [PATCH] [4.3] Fix untranslated constants in script.php (#41734) --- administrator/components/com_admin/script.php | 12 +++++++++--- language/en-GB/files_joomla.sys.ini | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 9801c16a3eee7..790c7f8a6602b 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -634,7 +634,13 @@ protected function updateManifestCaches() if (!$installer->refreshManifestCache($extension->extension_id)) { $this->collectError( __METHOD__, - new \Exception(Text::sprintf('FILES_JOOMLA_ERROR_MANIFEST', $extension->type, $extension->element, $extension->name, $extension->client_id)) + new \Exception(sprintf( + 'Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)', + $extension->type, + $extension->element, + $extension->name, + $extension->client_id + )) ); } } @@ -8001,7 +8007,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) if (File::delete(JPATH_ROOT . $file)) { $status['files_deleted'][] = $file; } else { - $status['files_errors'][] = Text::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $file); + $status['files_errors'][] = sprintf('Error on deleting file or folder %s', $file); } } } @@ -8017,7 +8023,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false) if (Folder::delete(JPATH_ROOT . $folder)) { $status['folders_deleted'][] = $folder; } else { - $status['folders_errors'][] = Text::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $folder); + $status['folders_errors'][] = sprintf('Error on deleting file or folder %s', $folder); } } } diff --git a/language/en-GB/files_joomla.sys.ini b/language/en-GB/files_joomla.sys.ini index ed17d91d71843..d5f0dd80e4447 100644 --- a/language/en-GB/files_joomla.sys.ini +++ b/language/en-GB/files_joomla.sys.ini @@ -4,6 +4,8 @@ ; Note : All ini files need to be saved as UTF-8 FILES_JOOMLA="Joomla CMS" +FILES_JOOMLA_XML_DESCRIPTION="Joomla! 4 Content Management System." + +; All the following strings are deprecated and will be removed with 6.0 FILES_JOOMLA_ERROR_FILE_FOLDER="Error on deleting file or folder %s" FILES_JOOMLA_ERROR_MANIFEST="Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)" -FILES_JOOMLA_XML_DESCRIPTION="Joomla! 4 Content Management System."