From 32f18897dfa55af6103554a2881499d95d589452 Mon Sep 17 00:00:00 2001 From: wilsonge Date: Tue, 15 Apr 2014 01:05:25 +0100 Subject: [PATCH] Move location of lang strings --- administrator/language/en-GB/en-GB.lib_joomla.ini | 5 +++++ language/en-GB/en-GB.files_joomla.sys.ini | 4 ---- language/en-GB/en-GB.lib_joomla.ini | 5 +++++ libraries/cms/helper/extensionscript.php | 12 ++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index 9472970927a3b..d497730166bab 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -514,11 +514,13 @@ JLIB_INSTALLER_ERROR_COMP_UPDATE_FAILED_TO_CREATE_DIRECTORY_SITE="Component Upda JLIB_INSTALLER_ERROR_CREATE_DIRECTORY="JInstaller: :Install: Failed to create directory: %s" JLIB_INSTALLER_ERROR_CREATE_FOLDER_FAILED="Failed to create directory [%s]" JLIB_INSTALLER_ERROR_DEPRECATED_FORMAT="Deprecated install format (client="_QQ_"both"_QQ_"), use package installer in future" +JLIB_INSTALLER_ERROR_DOWNGRADE="Sorry! You cannot downgrade from version %s to %s" JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connecting to the server: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s" JLIB_INSTALLER_ERROR_FAIL_COPY_FOLDER="JInstaller: :Install: Failed to copy folder %1$s to %2$s" JLIB_INSTALLER_ERROR_FAILED_READING_NETWORK_RESOURCES="Failed reading network resource: %s" JLIB_INSTALLER_ERROR_FILE_EXISTS="JInstaller: :Install: File already exists %s" +JLIB_INSTALLER_ERROR_FILE_FOLDER="Error on deleting file or folder %s" JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_MANIFEST="Files Uninstall: Invalid manifest file" JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Files Uninstall: Manifest file invalid or not found." JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_ENTRY="Files Uninstall: Could not load extension entry" @@ -577,7 +579,10 @@ JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DIRECTORY="Template Uninstall: Direc JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_ID_EMPTY="Template Uninstall: Template ID is empty, cannot uninstall files" JLIB_INSTALLER_ERROR_TPL_UNINSTALL_WARNCORETEMPLATE="Template Uninstall: Trying to uninstall a core template: %s" JLIB_INSTALLER_ERROR_UNKNOWN_CLIENT_TYPE="Unknown Client Type [%s]" +JLIB_INSTALLER_FILE_ERROR_MOVE="Error on moving file %s" JLIB_INSTALLER_INSTALL="Install" +JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum Joomla version requirement of J%s" +JLIB_INSTALLER_MINIMUM_PHP="Your server doesn't meet the minimum PHP version requirement of %s" JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users" JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for %d user" JLIB_INSTALLER_UNINSTALL="Uninstall" diff --git a/language/en-GB/en-GB.files_joomla.sys.ini b/language/en-GB/en-GB.files_joomla.sys.ini index 8ec53280ee1ce..55981c4ecfc91 100644 --- a/language/en-GB/en-GB.files_joomla.sys.ini +++ b/language/en-GB/en-GB.files_joomla.sys.ini @@ -7,7 +7,3 @@ FILES_JOOMLA="Joomla CMS" 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! 3 Content Management System" -FILES_JOOMLA_ERROR_MOVE="Error on moving file %s" -JGLOBAL_INCORRECT_SEQUENCE="Sorry! You cannot downgrade from version %s to %s" -JGLOBAL_MINIMUM_JOOMLA="You don't have the minimum Joomla version requirement of J%s" -JGLOBAL_MINIMUM_PHP="Your server doesn't meet the minimum PHP version requirement of %s" diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini index 9472970927a3b..d497730166bab 100644 --- a/language/en-GB/en-GB.lib_joomla.ini +++ b/language/en-GB/en-GB.lib_joomla.ini @@ -514,11 +514,13 @@ JLIB_INSTALLER_ERROR_COMP_UPDATE_FAILED_TO_CREATE_DIRECTORY_SITE="Component Upda JLIB_INSTALLER_ERROR_CREATE_DIRECTORY="JInstaller: :Install: Failed to create directory: %s" JLIB_INSTALLER_ERROR_CREATE_FOLDER_FAILED="Failed to create directory [%s]" JLIB_INSTALLER_ERROR_DEPRECATED_FORMAT="Deprecated install format (client="_QQ_"both"_QQ_"), use package installer in future" +JLIB_INSTALLER_ERROR_DOWNGRADE="Sorry! You cannot downgrade from version %s to %s" JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connecting to the server: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s" JLIB_INSTALLER_ERROR_FAIL_COPY_FOLDER="JInstaller: :Install: Failed to copy folder %1$s to %2$s" JLIB_INSTALLER_ERROR_FAILED_READING_NETWORK_RESOURCES="Failed reading network resource: %s" JLIB_INSTALLER_ERROR_FILE_EXISTS="JInstaller: :Install: File already exists %s" +JLIB_INSTALLER_ERROR_FILE_FOLDER="Error on deleting file or folder %s" JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_MANIFEST="Files Uninstall: Invalid manifest file" JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_NOTFOUND_MANIFEST="Files Uninstall: Manifest file invalid or not found." JLIB_INSTALLER_ERROR_FILE_UNINSTALL_LOAD_ENTRY="Files Uninstall: Could not load extension entry" @@ -577,7 +579,10 @@ JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DIRECTORY="Template Uninstall: Direc JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_ID_EMPTY="Template Uninstall: Template ID is empty, cannot uninstall files" JLIB_INSTALLER_ERROR_TPL_UNINSTALL_WARNCORETEMPLATE="Template Uninstall: Trying to uninstall a core template: %s" JLIB_INSTALLER_ERROR_UNKNOWN_CLIENT_TYPE="Unknown Client Type [%s]" +JLIB_INSTALLER_FILE_ERROR_MOVE="Error on moving file %s" JLIB_INSTALLER_INSTALL="Install" +JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum Joomla version requirement of J%s" +JLIB_INSTALLER_MINIMUM_PHP="Your server doesn't meet the minimum PHP version requirement of %s" JLIB_INSTALLER_NOTICE_LANG_RESET_USERS="Language set to Default for %d users" JLIB_INSTALLER_NOTICE_LANG_RESET_USERS_1="Language set to Default for %d user" JLIB_INSTALLER_UNINSTALL="Uninstall" diff --git a/libraries/cms/helper/extensionscript.php b/libraries/cms/helper/extensionscript.php index a9fe49f953126..fe115ae62d0f2 100644 --- a/libraries/cms/helper/extensionscript.php +++ b/libraries/cms/helper/extensionscript.php @@ -90,13 +90,13 @@ public function preflight($type, $parent) // Check for the minimum PHP version before continuing if (!empty($this->minimumPhp) && !version_compare(PHP_VERSION, $this->minimumPhp, '>')) { - JLog::add(JText::sprintf('JGLOBAL_MINIMUM_PHP', $this->minimumPhp), JLog::WARNING, 'jerror'); + JLog::add(JText::sprintf('JLIB_INSTALLER_MINIMUM_PHP', $this->minimumPhp), JLog::WARNING, 'jerror'); } // Check for the minimum Joomla version before continuing if (!empty($this->minimumJoomla) && !version_compare(JVERSION, $this->minimumJoomla, '>')) { - JLog::add(JText::sprintf('JGLOBAL_MINIMUM_JOOMLA', $this->minimumJoomla), JLog::WARNING, 'jerror'); + JLog::add(JText::sprintf('JLIB_INSTALLER_MINIMUM_JOOMLA', $this->minimumJoomla), JLog::WARNING, 'jerror'); } // Module manifest file version @@ -121,7 +121,7 @@ public function preflight($type, $parent) if (version_compare($this->release, $oldRelease, '<')) { - JFactory::getApplication()->enqueueMessage(JText::sprintf('JGLOBAL_INCORRECT_SEQUENCE', $oldRelease, $this->release), 'error'); + JFactory::getApplication()->enqueueMessage(JText::sprintf('JLIB_INSTALLER_INCORRECT_SEQUENCE', $oldRelease, $this->release), 'error'); return false; } @@ -299,7 +299,7 @@ public function removeFiles() { if (JFile::exists(JPATH_ROOT . $file) && !JFile::delete(JPATH_ROOT . $file)) { - echo JText::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $file) . '
'; + echo JText::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file) . '
'; } } } @@ -310,7 +310,7 @@ public function removeFiles() { if (JFolder::exists(JPATH_ROOT . $folder) && !JFolder::delete(JPATH_ROOT . $folder)) { - echo JText::sprintf('FILES_JOOMLA_ERROR_FILE_FOLDER', $folder) . '
'; + echo JText::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder) . '
'; } } } @@ -333,7 +333,7 @@ public function moveCliFiles() if (JFile::exists(JPATH_ROOT . $file) && !JFile::move(JPATH_ROOT . $file, JPATH_ROOT . '/cli/' . $name)) { - echo JText::sprintf('FILES_JOOMLA_ERROR_MOVE', $name); + echo JText::sprintf('JLIB_INSTALLER_FILE_ERROR_MOVE', $name); } } }