From c5b10972908bc3acbad33373f498d1719cb226b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 16 Jun 2017 20:43:28 +0200 Subject: [PATCH] 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 --- languages/Language.php | 7 ++++++- languages/data/Names.php | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index f84e21e53e..b5eef8caa0 100644 --- 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 21479f1c20..76ced3e4a6 100644 --- 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 -- 2.20.1