Native language (adjustments after 12036 merge) (#12394)

* restore native language * remvoe space * correct * simplify * improve code * ups * native language in unit test too
joomla · Oct 29, 2016 · 334d5a4 · 334d5a4
1 parent f1c6878
commit 334d5a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/libraries/joomla/language/helper.php b/libraries/joomla/language/helper.php
@@ -55,12 +55,12 @@ public static function createLanguageList($actualLanguage, $basePath = JPATH_BAS
 		{
 			if (!$installed || array_key_exists($lang, $installed_languages))
 			{
-				$option = array();
+				$option = array(
+					'text'  => isset($metadata['nativeName']) ? $metadata['nativeName'] : $metadata['name'],
+					'value' => $lang,
+				);
 
-				$option['text'] = $metadata['name'];
-				$option['value'] = $lang;
-
-				if ($lang == $actualLanguage)
+				if ($lang === $actualLanguage)
 				{
 					$option['selected'] = 'selected="selected"';
 				}

diff --git a/tests/unit/suites/libraries/joomla/language/JLanguageHelperTest.php b/tests/unit/suites/libraries/joomla/language/JLanguageHelperTest.php
@@ -23,7 +23,7 @@ class JLanguageHelperTest extends PHPUnit_Framework_TestCase
 	public function testCreateLanguageList()
 	{
 		$option = array(
-			'text'     => 'English (en-GB)',
+			'text'     => 'English (United Kingdom)',
 			'value'    => 'en-GB',
 			'selected' => 'selected="selected"'
 		);