Reverting r25772 for now.
authorBrion Vibber <brion@users.mediawiki.org>
Tue, 11 Sep 2007 15:22:53 +0000 (15:22 +0000)
committerBrion Vibber <brion@users.mediawiki.org>
Tue, 11 Sep 2007 15:22:53 +0000 (15:22 +0000)
The local language names as title are a cute feature, but a few problems:
* It only seems to use the values for the content language for this, though UI language would be more appropriate.
* A hojillion wfMsg() calls are made when Names.php is loaded, which feels kind of icky to me. Would trigger message cache initialization early and does a lot of extra calls not needed 99% of the time.
I'd rather only load values when required.

RELEASE-NOTES
includes/SkinTemplate.php
languages/Language.php
languages/Names.php
languages/messages/MessagesDe.php
languages/messages/MessagesEn.php
maintenance/language/messages.inc
skins/MonoBook.php

index f44595c..42a3823 100644 (file)
@@ -22,9 +22,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 === New features in 1.12 ===
 * Add a warning for non-descriptive filenames at Special:Upload
-* Add function Language::getLanguageNameLocal() for the localized name of a 
-  language
-* Add localized name of a language as title to interwiki links
 
 === Bug fixes in 1.12 ===
 
index 1d859ac..6ce4060 100644 (file)
@@ -416,14 +416,12 @@ class SkinTemplate extends Skin {
                        foreach( $wgOut->getLanguageLinks() as $l ) {
                                $tmp = explode( ':', $l, 2 );
                                $class = 'interwiki-' . $tmp[0];
-                               $localName = $wgContLang->getLanguageNameLocal( $tmp[0] );
                                unset($tmp);
                                $nt = Title::newFromText( $l );
                                $language_urls[] = array(
                                        'href' => $nt->getFullURL(),
                                        'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
-                                       'class' => $class,
-                                       'title' => $localName
+                                       'class' => $class
                                );
                        }
                }
index 013a5a4..a5a210a 100644 (file)
@@ -21,7 +21,7 @@ if( !defined( 'MEDIAWIKI' ) ) {
 #
 
 # Read language names
-global $wgLanguageNames, $wgLanguageNamesLocal;
+global $wgLanguageNames;
 require_once( dirname(__FILE__) . '/Names.php' ) ;
 
 global $wgInputEncoding, $wgOutputEncoding;
@@ -380,16 +380,6 @@ class Language {
                return $wgLanguageNames[$code];
        }
 
-       /**
-        * Get the localized name of a language
-        * @param string language code
-        * @return string localized name
-        */
-       function getLanguageNameLocal( $code ) {
-               global $wgLanguageNamesLocal, $wgLanguageNames;
-               return isset ( $wgLanguageNamesLocal[$code]['languageLocalName'] ) ? $wgLanguageNamesLocal[$code]['languageLocalName'] : '';
-       }
-
        function getMonthName( $key ) {
                return $this->getMessageFromDB( self::$mMonthMsgs[$key-1] );
        }
index 95761b5..3db72fe 100644 (file)
        'zu' => 'isiZulu'               # Zulu
 );
 
- /* private */ $wgLanguageNamesLocal = array();
-foreach( $wgLanguageNames as $codes => $code ) {
-       $message = wfMsg( "languagename-local-$codes" );
-       if( $message && !( wfEmptyMsg(  "languagename-local-$codes", $message ) ) ) {
-               $wgLanguageNamesLocal[$codes]['languageLocalName'] = $message ;
-       }
-};
index 9a783a0..34b5263 100644 (file)
@@ -2394,9 +2394,4 @@ Bitte bestätige, dass du diese Seite wirklich neu erstellen möchten.",
 'watchlisttools-raw'   => 'Listenformat bearbeiten (Import/Export)',
 'watchlisttools-clear' => 'löschen',
 
-# Language names in user language
-'languagename-local-de'           => 'Deutsch',
-'languagename-local-en'           => 'Englisch',
-'languagename-local-fr'           => 'Französisch',
-
 );
index e2a6200..79a55ce 100644 (file)
@@ -2990,296 +2990,4 @@ $1',
 'watchlisttools-raw'   => 'Edit raw watchlist',
 'watchlisttools-clear' => 'Clear watchlist',
 
-# Language names in user language
-'languagename-local-aa'           => 'Afar',
-'languagename-local-ab'           => 'Abkhaz',
-'languagename-local-af'           => 'Afrikaans',
-'languagename-local-ak'           => 'Akan',
-'languagename-local-als'          => 'Alemannic',
-'languagename-local-am'           => 'Amharic',
-'languagename-local-an'           => 'Aragonese',
-'languagename-local-ang'          => 'Old English',
-'languagename-local-ar'           => 'Arabic',
-'languagename-local-arc'          => 'Aramaic',
-'languagename-local-arn'          => 'Mapuche',
-'languagename-local-as'           => 'Assamese',
-'languagename-local-ast'          => 'Asturian',
-'languagename-local-av'           => 'Avar',
-'languagename-local-ay'           => 'Aymara',
-'languagename-local-az'           => 'Azerbaijani',
-'languagename-local-ba'           => 'Bashkir',
-'languagename-local-bar'          => 'Bavarian',
-'languagename-local-bat-smg'      => 'Samogitian',
-'languagename-local-bcl'          => 'BBikol',
-'languagename-local-be'           => 'Belarusian normative',
-'languagename-local-be-tarask'    => 'Belarusian in Taraskievica orthography',
-'languagename-local-be-x-old'     => 'Belarusian in Taraskievica orthography',
-'languagename-local-bg'           => 'Bulgarian',
-'languagename-local-bh'           => 'Bihara',
-'languagename-local-bi'           => 'Bislama',
-'languagename-local-bm'           => 'Bambara',
-'languagename-local-bn'           => 'Bengali',
-'languagename-local-bo'           => 'Tibetan',
-'languagename-local-bpy'          => 'Bishnupriya Manipuri',
-'languagename-local-br'           => 'Breton',
-'languagename-local-bs'           => 'Bosnian',
-'languagename-local-bug'          => 'Buginese',
-'languagename-local-bxr'          => 'Buryat',
-'languagename-local-ca'           => 'Catalan',
-'languagename-local-cbk-zam'      => 'Zamboanga Chavacano',
-'languagename-local-cdo'          => 'Min Dong',
-'languagename-local-ce'           => 'Chechen',
-'languagename-local-ceb'          => 'Cebuano',
-'languagename-local-ch'           => 'Chamorro',
-'languagename-local-cho'          => 'Choctaw',
-'languagename-local-chr'          => 'Cherokee',
-'languagename-local-chy'          => 'Cheyenne',
-'languagename-local-co'           => 'Corsican',
-'languagename-local-cr'           => 'Cree',
-'languagename-local-crh'          => 'Crimean Tatar',
-'languagename-local-crh-latn'     => 'Crimean Tatar (Latin)',
-'languagename-local-crh-cyrl'     => 'Crimean Tatar (Cyrillic)',
-'languagename-local-cs'           => 'Czech',
-'languagename-local-csb'          => 'Cassubian',
-'languagename-local-cu'           => 'Old Church Slavonic',
-'languagename-local-cv'           => 'Chuvash',
-'languagename-local-cy'           => 'Welsh',
-'languagename-local-da'           => 'Danish',
-'languagename-local-de'           => 'German',
-'languagename-local-diq'          => 'Zazaki',
-'languagename-local-dv'           => 'Dhivehi',
-'languagename-local-dz'           => 'Bhutani',
-'languagename-local-ee'           => 'Ewe',
-'languagename-local-el'           => 'Greek',
-'languagename-local-eml'          => 'Emilian-Romagnol / Sammarinese',
-'languagename-local-en'           => 'English',
-'languagename-local-eo'           => 'Esperanto',
-'languagename-local-es'           => 'Spanish',
-'languagename-local-et'           => 'Estonian',
-'languagename-local-eu'           => 'Basque',
-'languagename-local-ext'          => 'Extremaduran',
-'languagename-local-fa'           => 'Persian',
-'languagename-local-ff'           => 'Fulah',
-'languagename-local-fi'           => 'Finnish',
-'languagename-local-fiu-vro'      => 'Võro',
-'languagename-local-fj'           => 'Fijian',
-'languagename-local-fo'           => 'Faroese',
-'languagename-local-fr'           => 'French',
-'languagename-local-frc'          => 'Cajun French',
-'languagename-local-frp'          => 'Franco-Provençal/Arpitan',
-'languagename-local-fur'          => 'Friulian',
-'languagename-local-fy'           => 'Frisian',
-'languagename-local-ga'           => 'Irish',
-'languagename-local-gd'           => 'Scots Gaelic',
-'languagename-local-gl'           => 'Galician',
-'languagename-local-glk'          => 'Gilaki',
-'languagename-local-gn'           => 'Guarani',
-'languagename-local-got'          => 'Gothic',
-'languagename-local-gsw'          => 'Alemannic',
-'languagename-local-gu'           => 'Gujarati',
-'languagename-local-gv'           => 'Manx',
-'languagename-local-ha'           => 'Hausa',
-'languagename-local-hak'          => 'Hakka',
-'languagename-local-haw'          => 'Hawaiian',
-'languagename-local-he'           => 'Hebrew',
-'languagename-local-hi'           => 'Hindi',
-'languagename-local-hil'          => 'Hiligaynon',
-'languagename-local-ho'           => 'Hiri Motu',
-'languagename-local-hr'           => 'Croatian',
-'languagename-local-hsb'          => 'Upper Sorbian',
-'languagename-local-ht'           => 'Haitian',
-'languagename-local-hu'           => 'Hungarian',
-'languagename-local-hy'           => 'Armenian',
-'languagename-local-hz'           => 'Herero',
-'languagename-local-ia'           => 'Interlingua (IALA)',
-'languagename-local-id'           => 'Indonesian',
-'languagename-local-ie'           => 'Interlingue (Occidental)',
-'languagename-local-ig'           => 'Igbo',
-'languagename-local-ii'           => 'Sichuan Yi',
-'languagename-local-ik'           => 'Inupiak',
-'languagename-local-ilo'          => 'Ilokano',
-'languagename-local-io'           => 'Ido',
-'languagename-local-is'           => 'Icelandic',
-'languagename-local-it'           => 'Italian',
-'languagename-local-iu'           => 'Inuktitut',
-'languagename-local-ja'           => 'Japanese',
-'languagename-local-jbo'          => 'Lojban',
-'languagename-local-jv'           => 'Javanese',
-'languagename-local-ka'           => 'Georgian',
-'languagename-local-kaa'          => 'Karakalpak',
-'languagename-local-kab'          => 'Kabyle',
-'languagename-local-kg'           => 'Kongo',
-'languagename-local-ki'           => 'Kikuyu',
-'languagename-local-kj'           => 'Kuanyama',
-'languagename-local-kk'           => 'Kazakh',
-'languagename-local-kk-cn'        => 'Kazakh Arabic',
-'languagename-local-kk-kz'        => 'Kazakh Cyrillic',
-'languagename-local-kk-tr'        => 'Kazakh Latin',
-'languagename-local-kl'           => 'Greenlandic',
-'languagename-local-km'           => 'Cambodian',
-'languagename-local-kn'           => 'Kannada',
-'languagename-local-ko'           => 'Korean',
-'languagename-local-kr'           => 'Kanuri',
-'languagename-local-krj'          => 'Kinaray-a',
-'languagename-local-ks'           => 'Kashmiri',
-'languagename-local-ksh'          => 'Ripuarian ',
-'languagename-local-ku'           => 'Kurdish',
-'languagename-local-ku-latn'      => 'Kurdish Latin script',
-'languagename-local-ku-arab'      => 'Kurdish Arabic script',
-'languagename-local-kv'           => 'Komi',
-'languagename-local-kw'           => 'Cornish',
-'languagename-local-ky'           => 'Kirghiz',
-'languagename-local-la'           => 'Latin',
-'languagename-local-lad'          => 'Ladino',
-'languagename-local-lbe'          => 'Lak',
-'languagename-local-lb'           => 'Luxemburguish',
-'languagename-local-lg'           => 'Ganda',
-'languagename-local-li'           => 'Limburgian',
-'languagename-local-lij'          => 'Ligurian',
-'languagename-local-lld'          => 'Ladin',
-'languagename-local-lmo'          => 'Lombard',
-'languagename-local-ln'           => 'Lingala',
-'languagename-local-lo'           => 'Laotian',
-'languagename-local-lt'           => 'Lithuanian',
-'languagename-local-lv'           => 'Latvian',
-'languagename-local-lzz'          => 'Laz',
-'languagename-local-map-bms'      => 'Banyumasan ',
-'languagename-local-mg'           => 'Malagasy',
-'languagename-local-mh'           => 'Marshallese',
-'languagename-local-mi'           => 'Maori',
-'languagename-local-minnan'       => 'Min-nan',
-'languagename-local-mk'           => 'Macedonian',
-'languagename-local-ml'           => 'Malayalam',
-'languagename-local-mn'           => 'Mongoloian',
-'languagename-local-mo'           => 'Moldovan',
-'languagename-local-mr'           => 'Marathi',
-'languagename-local-ms'           => 'Malay',
-'languagename-local-mt'           => 'Maltese',
-'languagename-local-mus'          => 'Creek',
-'languagename-local-my'           => 'Burmese',
-'languagename-local-mzn'          => 'Mazandarin',
-'languagename-local-na'           => 'Nauruan',
-'languagename-local-nah'          => 'Nahuatl',
-'languagename-local-nan'          => 'Min-nan',
-'languagename-local-nap'          => 'Neapolitan',
-'languagename-local-nb'           => 'Norwegian (Bokmal)',
-'languagename-local-nds'          => 'Low German',
-'languagename-local-nds-nl'       => 'Dutch Low Saxon',
-'languagename-local-ne'           => 'Nepali',
-'languagename-local-new'          => 'Newar / Nepal Bhasa',
-'languagename-local-ng'           => 'Ndonga',
-'languagename-local-nl'           => 'Dutch',
-'languagename-local-nn'           => 'Norwegian (Nynorsk)',
-'languagename-local-no'           => 'Norwegian',
-'languagename-local-non'          => 'Old Norse',
-'languagename-local-nov'          => 'Novial',
-'languagename-local-nrm'          => 'Norman',
-'languagename-local-nv'           => 'Navajo',
-'languagename-local-ny'           => 'Chichewa',
-'languagename-local-oc'           => 'Occitan',
-'languagename-local-om'           => 'Oromo',
-'languagename-local-or'           => 'Oriya',
-'languagename-local-os'           => 'Ossetic',
-'languagename-local-pa'           => 'Punjabi',
-'languagename-local-pag'          => 'Pangasinan',
-'languagename-local-pam'          => 'Pampanga',
-'languagename-local-pap'          => 'Papiamentu',
-'languagename-local-pdc'          => 'Pennsylvania German',
-'languagename-local-pi'           => 'Pali',
-'languagename-local-pih'          => 'Norfuk',
-'languagename-local-pl'           => 'Polish',
-'languagename-local-pms'          => 'Piedmontese',
-'languagename-local-ps'           => 'Pashto',
-'languagename-local-pt'           => 'Portuguese',
-'languagename-local-pt-br'        => 'Brazilian Portuguese',
-'languagename-local-qu'           => 'Quechua',
-'languagename-local-rm'           => 'Raeto-Romance',
-'languagename-local-rmy'          => 'Vlax Romany',
-'languagename-local-rn'           => 'Kirundi',
-'languagename-local-ro'           => 'Romanian',
-'languagename-local-roa-rup'      => 'Aromanian',
-'languagename-local-roa-tara'     => 'Tarantino',
-'languagename-local-ru'           => 'Russian',
-'languagename-local-ru-sib'       => 'Siberian/North Russian',
-'languagename-local-rw'           => 'Kinyarwanda',
-'languagename-local-sa'           => 'Sanskrit',
-'languagename-local-sah'          => 'Sakha',
-'languagename-local-sc'           => 'Sardinian',
-'languagename-local-scn'          => 'Sicilian',
-'languagename-local-sco'          => 'Scots',
-'languagename-local-sd'           => 'Sindhi',
-'languagename-local-se'           => 'Northern Sami',
-'languagename-local-sg'           => 'Sango',
-'languagename-local-sh'           => 'Serbocroatian',
-'languagename-local-si'           => 'Sinhalese',
-'languagename-local-simple'       => 'Simple English',
-'languagename-local-sk'           => 'Slovak',
-'languagename-local-sl'           => 'Slovenian',
-'languagename-local-sm'           => 'Samoan',
-'languagename-local-sn'           => 'Shona',
-'languagename-local-so'           => 'Somali',
-'languagename-local-sq'           => 'Albanian',
-'languagename-local-sr'           => 'Serbian',
-'languagename-local-sr-ec'        => 'Serbian cyrillic ekavian',
-'languagename-local-sr-jc'        => 'Serbian cyrillic iyekvian',
-'languagename-local-sr-el'        => 'Serbian latin ekavian',
-'languagename-local-sr-jl'        => 'Serbian latin iyekavian',
-'languagename-local-ss'           => 'Swati',
-'languagename-local-st'           => 'Southern Sotho',
-'languagename-local-su'           => 'Sundanese',
-'languagename-local-sv'           => 'Swedish',
-'languagename-local-sw'           => 'Swahili',
-'languagename-local-ta'           => 'Tamil',
-'languagename-local-te'           => 'Telugu',
-'languagename-local-tet'          => 'Tetun',
-'languagename-local-tg'           => 'Tajik',
-'languagename-local-th'           => 'Thai',
-'languagename-local-ti'           => 'Tigrinya',
-'languagename-local-tk'           => 'Turkmen',
-'languagename-local-tl'           => 'Tagalog',
-'languagename-local-tn'           => 'Setswana',
-'languagename-local-to'           => 'Tonga',
-'languagename-local-tokipona'     => 'Toki Pona',
-'languagename-local-tp'           => 'Toki Pona',
-'languagename-local-tpi'          => 'Tok Pisin',
-'languagename-local-tr'           => 'Turkish',
-'languagename-local-ts'           => 'Tsonga',
-'languagename-local-tt'           => 'Tatar',
-'languagename-local-tum'          => 'Tumbuka',
-'languagename-local-tw'           => 'Twi',
-'languagename-local-ty'           => 'Tahitian',
-'languagename-local-tyv'          => 'Tyvan',
-'languagename-local-udm'          => 'Udmurt',
-'languagename-local-ug'           => 'Uyghur',
-'languagename-local-uk'           => 'Ukrainian',
-'languagename-local-ur'           => 'Urdu',
-'languagename-local-uz'           => 'Uzbek',
-'languagename-local-ve'           => 'Venda',
-'languagename-local-vec'          => 'Venetian',
-'languagename-local-vi'           => 'Vietnamese',
-'languagename-local-vls'          => 'West Flemish',
-'languagename-local-vo'           => 'Volapük',
-'languagename-local-wa'           => 'Walloon',
-'languagename-local-war'          => 'Waray-Waray',
-'languagename-local-wo'           => 'Wolof',
-'languagename-local-wuu'          => 'Wu',
-'languagename-local-xal'          => 'Kalmyk',
-'languagename-local-xh'           => 'Xhosan',
-'languagename-local-yi'           => 'Yiddish',
-'languagename-local-yo'           => 'Yoruba',
-'languagename-local-yue'          => 'Cantonese',
-'languagename-local-za'           => 'Zhuang',
-'languagename-local-zea'          => 'Zealandic',
-'languagename-local-zh'           => 'Chinese',
-'languagename-local-zh-cfr'       => 'Min-nan',
-'languagename-local-zh-classical' => 'Classical Chinese/Literary Chinese',
-'languagename-local-zh-cn'        => 'Chinese (PRC)',
-'languagename-local-zh-hans'      => 'Chinese written using the Simplified Chinese script',
-'languagename-local-zh-hant'      => 'Chinese written using the Traditional Chinese script',
-'languagename-local-zh-hk'        => 'Chinese (Hong Kong)',
-'languagename-local-zh-min-nan'   => 'Min-nan',
-'languagename-local-zh-sg'        => 'Chinese (Singapore)',
-'languagename-local-zh-tw'        => 'Chinese (Taiwan)',
-'languagename-local-zh-yue'       => 'Cantonese',
-'languagename-local-zu'           => 'aZulu',
 );
index fb92b77..7b65698 100644 (file)
@@ -2210,300 +2210,7 @@ $wgMessageStructure = array(
                'watchlisttools-raw',
                'watchlisttools-clear',
        ),
-       'languagelocal' => array(
-               'languagename-local-aa',
-               'languagename-local-ab',
-               'languagename-local-af',
-               'languagename-local-ak',
-               'languagename-local-als',
-               'languagename-local-am',
-               'languagename-local-an',
-               'languagename-local-ang',
-               'languagename-local-ar',
-               'languagename-local-arc',
-               'languagename-local-arn',
-               'languagename-local-as',
-               'languagename-local-ast',
-               'languagename-local-av',
-               'languagename-local-ay',
-               'languagename-local-az',
-               'languagename-local-ba',
-               'languagename-local-bar',
-               'languagename-local-bat-smg',
-               'languagename-local-bcl',
-               'languagename-local-be',
-               'languagename-local-be-tarask',
-               'languagename-local-be-x-old',
-               'languagename-local-bg',
-               'languagename-local-bh',
-               'languagename-local-bi',
-               'languagename-local-bm',
-               'languagename-local-bn',
-               'languagename-local-bo',
-               'languagename-local-bpy',
-               'languagename-local-br',
-               'languagename-local-bs',
-               'languagename-local-bug',
-               'languagename-local-bxr',
-               'languagename-local-ca',
-               'languagename-local-cbk-zam',
-               'languagename-local-cdo',
-               'languagename-local-ce',
-               'languagename-local-ceb',
-               'languagename-local-ch',
-               'languagename-local-cho',
-               'languagename-local-chr',
-               'languagename-local-chy',
-               'languagename-local-co',
-               'languagename-local-cr',
-               'languagename-local-crh',
-               'languagename-local-crh-latn',
-               'languagename-local-crh-cyrl',
-               'languagename-local-cs',
-               'languagename-local-csb',
-               'languagename-local-cu',
-               'languagename-local-cv',
-               'languagename-local-cy',
-               'languagename-local-da',
-               'languagename-local-de',
-               'languagename-local-diq',
-               'languagename-local-dv',
-               'languagename-local-dz',
-               'languagename-local-ee',
-               'languagename-local-el',
-               'languagename-local-eml',
-               'languagename-local-en',
-               'languagename-local-eo',
-               'languagename-local-es',
-               'languagename-local-et',
-               'languagename-local-eu',
-               'languagename-local-ext',
-               'languagename-local-fa',
-               'languagename-local-ff',
-               'languagename-local-fi',
-               'languagename-local-fiu-vro',
-               'languagename-local-fj',
-               'languagename-local-fo',
-               'languagename-local-fr',
-               'languagename-local-frc',
-               'languagename-local-frp',
-               'languagename-local-fur',
-               'languagename-local-fy',
-               'languagename-local-ga',
-               'languagename-local-gd',
-               'languagename-local-gl',
-               'languagename-local-glk',
-               'languagename-local-gn',
-               'languagename-local-got',
-               'languagename-local-gsw',
-               'languagename-local-gu',
-               'languagename-local-gv',
-               'languagename-local-ha',
-               'languagename-local-hak',
-               'languagename-local-haw',
-               'languagename-local-he',
-               'languagename-local-hi',
-               'languagename-local-hil',
-               'languagename-local-ho',
-               'languagename-local-hr',
-               'languagename-local-hsb',
-               'languagename-local-ht',
-               'languagename-local-hu',
-               'languagename-local-hy',
-               'languagename-local-hz',
-               'languagename-local-ia',
-               'languagename-local-id',
-               'languagename-local-ie',
-               'languagename-local-ig',
-               'languagename-local-ii',
-               'languagename-local-ik',
-               'languagename-local-ilo',
-               'languagename-local-io',
-               'languagename-local-is',
-               'languagename-local-it',
-               'languagename-local-iu',
-               'languagename-local-ja',
-               'languagename-local-jbo',
-               'languagename-local-jv',
-               'languagename-local-ka',
-               'languagename-local-kaa',
-               'languagename-local-kab',
-               'languagename-local-kg',
-               'languagename-local-ki',
-               'languagename-local-kj',
-               'languagename-local-kk',
-               'languagename-local-kk-cn',
-               'languagename-local-kk-kz',
-               'languagename-local-kk-tr',
-               'languagename-local-kl',
-               'languagename-local-km',
-               'languagename-local-kn',
-               'languagename-local-ko',
-               'languagename-local-kr',
-               'languagename-local-krj',
-               'languagename-local-ks',
-               'languagename-local-ksh',
-               'languagename-local-ku',
-               'languagename-local-ku-latn',
-               'languagename-local-ku-arab',
-               'languagename-local-kv',
-               'languagename-local-kw',
-               'languagename-local-ky',
-               'languagename-local-la',
-               'languagename-local-lad',
-               'languagename-local-lbe',
-               'languagename-local-lb',
-               'languagename-local-lg',
-               'languagename-local-li',
-               'languagename-local-lij',
-               'languagename-local-lld',
-               'languagename-local-lmo',
-               'languagename-local-ln',
-               'languagename-local-lo',
-               'languagename-local-lt',
-               'languagename-local-lv',
-               'languagename-local-lzz',
-               'languagename-local-map-bms',
-               'languagename-local-mg',
-               'languagename-local-mh',
-               'languagename-local-mi',
-               'languagename-local-minnan',
-               'languagename-local-mk',
-               'languagename-local-ml',
-               'languagename-local-mn',
-               'languagename-local-mo',
-               'languagename-local-mr',
-               'languagename-local-ms',
-               'languagename-local-mt',
-               'languagename-local-mus',
-               'languagename-local-my',
-               'languagename-local-mzn',
-               'languagename-local-na',
-               'languagename-local-nah',
-               'languagename-local-nan',
-               'languagename-local-nap',
-               'languagename-local-nb',
-               'languagename-local-nds',
-               'languagename-local-nds-nl',
-               'languagename-local-ne',
-               'languagename-local-new',
-               'languagename-local-ng',
-               'languagename-local-nl',
-               'languagename-local-nn',
-               'languagename-local-no',
-               'languagename-local-non',
-               'languagename-local-nov',
-               'languagename-local-nrm',
-               'languagename-local-nv',
-               'languagename-local-ny',
-               'languagename-local-oc',
-               'languagename-local-om',
-               'languagename-local-or',
-               'languagename-local-os',
-               'languagename-local-pa',
-               'languagename-local-pag',
-               'languagename-local-pam',
-               'languagename-local-pap',
-               'languagename-local-pdc',
-               'languagename-local-pi',
-               'languagename-local-pih',
-               'languagename-local-pl',
-               'languagename-local-pms',
-               'languagename-local-ps',
-               'languagename-local-pt',
-               'languagename-local-pt-br',
-               'languagename-local-qu',
-               'languagename-local-rm',
-               'languagename-local-rmy',
-               'languagename-local-rn',
-               'languagename-local-ro',
-               'languagename-local-roa-rup',
-               'languagename-local-roa-tara',
-               'languagename-local-ru',
-               'languagename-local-ru-sib',
-               'languagename-local-rw',
-               'languagename-local-sa',
-               'languagename-local-sah',
-               'languagename-local-sc',
-               'languagename-local-scn',
-               'languagename-local-sco',
-               'languagename-local-sd',
-               'languagename-local-se',
-               'languagename-local-sg',
-               'languagename-local-sh',
-               'languagename-local-si',
-               'languagename-local-simple',
-               'languagename-local-sk',
-               'languagename-local-sl',
-               'languagename-local-sm',
-               'languagename-local-sn',
-               'languagename-local-so',
-               'languagename-local-sq',
-               'languagename-local-sr',
-               'languagename-local-sr-ec',
-               'languagename-local-sr-jc',
-               'languagename-local-sr-el',
-               'languagename-local-sr-jl',
-               'languagename-local-ss',
-               'languagename-local-st',
-               'languagename-local-su',
-               'languagename-local-sv',
-               'languagename-local-sw',
-               'languagename-local-ta',
-               'languagename-local-te',
-               'languagename-local-tet',
-               'languagename-local-tg',
-               'languagename-local-th',
-               'languagename-local-ti',
-               'languagename-local-tk',
-               'languagename-local-tl',
-               'languagename-local-tn',
-               'languagename-local-to',
-               'languagename-local-tokipona',
-               'languagename-local-tp',
-               'languagename-local-tpi',
-               'languagename-local-tr',
-               'languagename-local-ts',
-               'languagename-local-tt',
-               'languagename-local-tum',
-               'languagename-local-tw',
-               'languagename-local-ty',
-               'languagename-local-tyv',
-               'languagename-local-udm',
-               'languagename-local-ug',
-               'languagename-local-uk',
-               'languagename-local-ur',
-               'languagename-local-uz',
-               'languagename-local-ve',
-               'languagename-local-vec',
-               'languagename-local-vi',
-               'languagename-local-vls',
-               'languagename-local-vo',
-               'languagename-local-wa',
-               'languagename-local-war',
-               'languagename-local-wo',
-               'languagename-local-wuu',
-               'languagename-local-xal',
-               'languagename-local-xh',
-               'languagename-local-yi',
-               'languagename-local-yo',
-               'languagename-local-yue',
-               'languagename-local-za',
-               'languagename-local-zea',
-               'languagename-local-zh',
-               'languagename-local-zh-cfr',
-               'languagename-local-zh-classical',
-               'languagename-local-zh-cn',
-               'languagename-local-zh-hans',
-               'languagename-local-zh-hant',
-               'languagename-local-zh-hk',
-               'languagename-local-zh-min-nan',
-               'languagename-local-zh-sg',
-               'languagename-local-zh-tw',
-               'languagename-local-zh-yue',
-               'languagename-local-zu',
-               ),
-       );
+);
 /** Comments for each block */
 $wgBlockComments = array(
        'sidebar'             => "The sidebar for MonoBook is generated from this message, lines that do not
@@ -2669,9 +2376,8 @@ Variants for Chinese language",
        'sizeunits'           => 'Size units',
        'livepreview'         => 'Live preview',
        'lagwarning'          => 'Friendlier slave lag warnings',
-       'watchlisteditor'     => 'Watchlist editor',
-       'watchlisttools'      => 'Watchlist editing tools',
-       'languagelocal'       => 'Language names in user language',
+       'watchlisteditor' => 'Watchlist editor',
+       'watchlisttools' => 'Watchlist editing tools',
 );
 
 /** Short comments for standalone messages */
index 3fc5022..e61f94a 100644 (file)
@@ -234,9 +234,8 @@ class MonoBookTemplate extends QuickTemplate {
                <div class="pBody">
                        <ul>
 <?php          foreach($this->data['language_urls'] as $langlink) { ?>
-                               <li class="<?php echo htmlspecialchars( $langlink['class'] )?>"><?php
-                               ?><a title="<?php echo htmlspecialchars( $langlink['title'] ) 
-                               ?>" href="<?php echo htmlspecialchars( $langlink['href'] ) ?>"><?php echo $langlink['text']?></a></li>
+                               <li class="<?php echo htmlspecialchars($langlink['class'])?>"><?php
+                               ?><a href="<?php echo htmlspecialchars($langlink['href']) ?>"><?php echo $langlink['text'] ?></a></li>
 <?php          } ?>
                        </ul>
                </div>