Click to expand the diff!
```diff
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index 38851848428f..f3a3fb45fcc8 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -190,6 +190,9 @@ INSTL_PAGE_TITLE="Joomla Installer"
INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %d."
INSTL_STD_OFFLINE_MSG="This site is down for maintenance. Please check back again soon."
+; Languages model
+INSTL_ERROR_INVALID_URL="Invalid URL"
+
; Others
INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder."
INSTL_DISPLAY_ERRORS="Display Errors"
@@ -249,6 +252,7 @@ JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder:
JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist."
JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s."
JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Package %s: There were no files to install!"
+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_INSTALL="Install"
JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed."
diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
index 468fd3bce70a..1317f0f366a8 100644
--- a/installation/src/Model/LanguagesModel.php
+++ b/installation/src/Model/LanguagesModel.php
@@ -289,7 +289,7 @@ protected function downloadPackage($url)
// Was the package downloaded?
if (!$p_file)
{
- $app->enqueueMessage(Text::_('COM_INSTALLER_MSG_INSTALL_INVALID_URL'), 'warning');
+ $app->enqueueMessage(Text::_('INSTL_ERROR_INVALID_URL'), 'warning');
return false;
}
```
PR w związku ze zmianą oryginału https://github.com/joomla/joomla-cms/pull/38080 Poniżej zmiany w oryginale:
Click to expand the diff!
```diff diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini index 38851848428f..f3a3fb45fcc8 100644 --- a/installation/language/en-GB/joomla.ini +++ b/installation/language/en-GB/joomla.ini @@ -190,6 +190,9 @@ INSTL_PAGE_TITLE="Joomla Installer" INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %d." INSTL_STD_OFFLINE_MSG="This site is down for maintenance.Please check back again soon." +; Languages model +INSTL_ERROR_INVALID_URL="Invalid URL" + ; Others INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." INSTL_DISPLAY_ERRORS="Display Errors" @@ -249,6 +252,7 @@ JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder: JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist." JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s." JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Package %s: There were no files to install!" +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_INSTALL="Install" JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php index 468fd3bce70a..1317f0f366a8 100644 --- a/installation/src/Model/LanguagesModel.php +++ b/installation/src/Model/LanguagesModel.php @@ -289,7 +289,7 @@ protected function downloadPackage($url) // Was the package downloaded? if (!$p_file) { - $app->enqueueMessage(Text::_('COM_INSTALLER_MSG_INSTALL_INVALID_URL'), 'warning'); + $app->enqueueMessage(Text::_('INSTL_ERROR_INVALID_URL'), 'warning'); return false; } ```