Follow-up r106559: it's better to set the preference for own MediaWiki names in Langu...

Also update Babel to use that function.

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 25278e9..6f1bb50 100644 (file)
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -609,21 +609,8 @@ class CoreParserFunctions {
         */
        static function language( $parser, $code = '', $inLanguage = '' ) {
                $code = strtolower( $code );
-               $inLanguage = strtolower( $inLanguage );
-
-               if( $inLanguage === $code || $inLanguage === '' ) {
-                       # Make sure the output is the same when the second parameter
-                       # is the same language
-                       global $wgContLang;
-                       $name = $wgContLang->getLanguageName( $code );
-                       if( $name !== '' ) {
-                               return $name;
-                       } else {
-                               # Try if there is a language name below
-                               $inLanguage = $code;
-                       }
-               }
-
+               # default to native language name
+               $inLanguage = $inLanguage !== '' ? strtolower( $inLanguage ) : $code;
                $names = Language::getTranslatedLanguageNames( $inLanguage );
                return isset( $names[$code] ) ? $names[$code] : wfBCP47( $code );
        }

diff --git a/languages/Language.php b/languages/Language.php
index 9b201c8..2eb66aa 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -682,8 +682,12 @@ class Language {
                $names = array();
                wfRunHooks( 'LanguageGetTranslatedLanguageNames', array( &$names, $code ) );
 
-               foreach ( self::getLanguageNames() as $code => $name ) {
-                       if ( !isset( $names[$code] ) ) $names[$code] = $name;
+               foreach ( self::getLanguageNames() as $code2 => $name ) {
+                       # Prefer own MediaWiki native name,
+                       # for other names just add if not added through the hook
+                       if ( $code === $code2 || !isset( $names[$code2] ) ) {
+                               $names[$code2] = $name;
+                       }
                }
 
                return $names;