Hide Pig Latin language entirely if $wgUsePigLatinVariant is false

Previously, even if $wgUsePigLatinVariant was false, the language
would show up on Special:Preferences (and some other places) as
'en-x-piglatin - Igpay Atinlay'.

Follow-up to d8375bee241b4d134aff901c7d072aa1374c860b.

Change-Id: I08faacabca87c04299c7b535be8df1770e0a37ac

diff --git a/languages/Language.php b/languages/Language.php
index f84e21e..b5eef8c 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -827,7 +827,7 @@ class Language {
         * @return array Language code => language name
         */
        private static function fetchLanguageNamesUncached( $inLanguage = null, $include = 'mw' ) {
-               global $wgExtraLanguageNames;
+               global $wgExtraLanguageNames, $wgUsePigLatinVariant;
 
                // If passed an invalid language code to use, fallback to en
                if ( $inLanguage !== null && !Language::isValidCode( $inLanguage ) ) {
@@ -842,6 +842,11 @@ class Language {
                }
 
                $mwNames = $wgExtraLanguageNames + MediaWiki\Languages\Data\Names::$names;
+               if ( $wgUsePigLatinVariant ) {
+                       // Pig Latin (for variant development)
+                       $mwNames['en-x-piglatin'] = 'Igpay Atinlay';
+               }
+
                foreach ( $mwNames as $mwCode => $mwName ) {
                        # - Prefer own MediaWiki native name when not using the hook
                        # - For other names just add if not added through the hook

diff --git a/languages/data/Names.php b/languages/data/Names.php
index 21479f1..76ced3e 100644 (file)
--- a/languages/data/Names.php
+++ b/languages/data/Names.php
@@ -146,7 +146,6 @@ class Names {
                'en' => 'English', # English
                'en-ca' => 'Canadian English', # Canadian English
                'en-gb' => 'British English', # British English
-               'en-x-piglatin' => 'Igpay Atinlay', # Pig Latin (for variant development)
                'eo' => 'Esperanto', # Esperanto
                'es' => 'español', # Spanish
                'et' => 'eesti', # Estonian