Show the button only when the default language is not the language

loaded.
joomla · Feb 14, 2016 · c78fa8c · c78fa8c
1 parent 630158c
commit c78fa8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/administrator/components/com_languages/views/installed/view.html.php b/administrator/components/com_languages/views/installed/view.html.php
@@ -95,7 +95,10 @@ protected function addToolbar()
 			JToolbarHelper::divider();
 
 			// Force administrator language
-			if ($this->state->get('filter.client_id', 0) == 1)
+			$defaultLang = JComponentHelper::getParams('com_languages')->get('administrator','en-GB');
+			$currentLang = JFactory::getLanguage()->getTag();
+
+			if ($defaultLang != $currentLang && $this->state->get('filter.client_id', 0) == 1)
 			{
 				JToolbarHelper::custom('installed.forceadminlanguage', 'refresh', 'refresh', 'COM_LANGUAGES_FORCE_ADMIN', false);
 				JToolbarHelper::divider();

diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -15,7 +15,7 @@ COM_LANGUAGES_FIELD_IMAGE_DESC="Prefix of the image file for this language when
 COM_LANGUAGES_FIELD_IMAGE_LABEL="Image Prefix"
 COM_LANGUAGES_FIELD_LANG_TAG_DESC="Enter the language tag – example: en-GB for English (UK). This should be the exact prefix used for the language installed or to be installed."
 COM_LANGUAGES_FIELD_LANG_TAG_LABEL="Language Tag"
-COM_LANGUAGES_FORCE_ADMIN="Force Administrator Language"
+COM_LANGUAGES_FORCE_ADMIN="Load Default Administrator Language"
 COM_LANGUAGES_INSTALL="Install Language"
 COM_LANGUAGES_OVERRIDE_ERROR_RESERVED_WORDS="YES, NO, NULL, FALSE, ON, OFF, NONE, TRUE are reserved words and can't be used as language constants."
 COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL="For both locations"