diff --git a/administrator/components/com_languages/Controller/InstalledController.php b/administrator/components/com_languages/Controller/InstalledController.php
index 6b54d1b3635aa..d24132ac9cefd 100644
--- a/administrator/components/com_languages/Controller/InstalledController.php
+++ b/administrator/components/com_languages/Controller/InstalledController.php
@@ -14,6 +14,7 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Installer\Installer;
use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\MultiLanguage;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Controller\BaseController;
use Joomla\CMS\Session\Session;
@@ -50,8 +51,16 @@ public function setDefault()
$newLang->load('com_languages', JPATH_ADMINISTRATOR);
}
- $msg = Text::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
- $type = 'message';
+ if (Multilanguage::isEnabled() && $model->getState('client_id') == 0)
+ {
+ $msg = Text::_('COM_LANGUAGES_MSG_DEFAULT_MULTILANG_SAVED');
+ $type = 'message';
+ }
+ else
+ {
+ $msg = Text::_('COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED');
+ $type = 'message';
+ }
}
else
{
diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
index 8273296b95666..c336dd66c8cd9 100644
--- a/administrator/language/en-GB/en-GB.com_languages.ini
+++ b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -56,7 +56,8 @@ COM_LANGUAGES_INSTALL="Install Languages"
COM_LANGUAGES_INSTALLED_FILTER_SEARCH_DESC="Search in title and language tag."
COM_LANGUAGES_INSTALLED_FILTER_SEARCH_LABEL="Search Installed Languages"
COM_LANGUAGES_INSTALLED_TABLE_CAPTION="Table of Installed Languages"
-COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.
Warning! When using the multilingual functionality (ie when the plugin System - Language Filter is enabled) the Site Default Language also has to be a published Content language."
+COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page."
+COM_LANGUAGES_MSG_DEFAULT_MULTILANG_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.
Warning! The Site Default Language also has to be a published Content language."
COM_LANGUAGES_MSG_SWITCH_ADMIN_LANGUAGE_SUCCESS="The Administrator Language has been switched to "%s"."
COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR="Some of the contacts linked to the user %s are incorrect."
COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP="Warning! A user/author should have only one contact to which is assigned language 'All' OR one contact for each published Content Language."