self revert r45512, r45513 and r45515 for now

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index dae3952..6502aa0 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -55,7 +55,6 @@ class FakeConverter {
 class Language {
        var $mConverter, $mVariants, $mCode, $mLoaded = false;
        var $mMagicExtensions = array(), $mMagicHookDone = false;
-       var $mLocalizedLanguagesNames = null;
 
        static public $mLocalisationKeys = array(
                'fallback', 'namespaceNames', 'mathNames', 'bookstoreList',
@@ -410,19 +409,6 @@ class Language {
                return $names;
        }
 
-       /**
-        * Get localized language names
-        *
-        * @return array
-        */
-       function getLocalizedLanguageNames() {
-               if( !is_array( $this->mLocalizedLanguagesNames ) ) {
-                       $this->mLocalizedLanguagesNames = array();
-                       wfRunHooks( 'LanguageGetLocalizedLanguageNames', array( &$this->mLocalizedLanguagesNames, $this->getCode() ) );
-               }
-               return $this->mLocalizedLanguagesNames;
-       }
-
        /**
         * Get a message from the MediaWiki namespace.
         *
@@ -433,27 +419,12 @@ class Language {
                return wfMsgExt( $msg, array( 'parsemag', 'language' => $this ) );
        }
 
-       /**
-        * Get a language name
-        *
-        * @param $code String language code
-        * @return $localized boolean gets the localized language name
-        */
-       function getLanguageName( $code, $localized = false ) {
+       function getLanguageName( $code ) {
                $names = self::getLanguageNames();
                if ( !array_key_exists( $code, $names ) ) {
                        return '';
                }
-               if( $localized ) {
-                       $languageNames = $this->getLocalizedLanguageNames();
-                       return isset( $languageNames[$code] ) ? $languageNames[$code] : $names[$code];
-               } else {
-                       return $names[$code];
-               }
-       }
-
-       function getLanguageNameLocalized( $code ) {
-               return self::getLanguageName( $code, true );
+               return $names[$code];
        }
 
        function getMonthName( $key ) {