jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358018 )
Change subject: Replace deprecated $wgDummyLanguageCodes in WebInstallerLanguage.php ...................................................................... Replace deprecated $wgDummyLanguageCodes in WebInstallerLanguage.php The internal language codes of the reserved for local use area 'qqq' and 'qqx' are not in Language::fetchLanguageNames(). The check for deprecated language codes can removed, when they are removed from Language::fetchLanguageNames(). Change-Id: I5d67ac3f9fbf341ee6bd84094fb671e97e512dd4 --- M includes/installer/WebInstallerLanguage.php 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Chad: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/installer/WebInstallerLanguage.php b/includes/installer/WebInstallerLanguage.php index cfd4a86..bce07d3 100644 --- a/includes/installer/WebInstallerLanguage.php +++ b/includes/installer/WebInstallerLanguage.php @@ -98,17 +98,19 @@ * @return string */ public function getLanguageSelector( $name, $label, $selectedCode, $helpHtml = '' ) { - global $wgDummyLanguageCodes; + global $wgExtraLanguageCodes; $output = $helpHtml; $select = new XmlSelect( $name, $name, $selectedCode ); $select->setAttribute( 'tabindex', $this->parent->nextTabIndex() ); + $unwantedLanguageCodes = $wgExtraLanguageCodes + + LanguageCode::getDeprecatedCodeMapping(); $languages = Language::fetchLanguageNames(); ksort( $languages ); foreach ( $languages as $code => $lang ) { - if ( isset( $wgDummyLanguageCodes[$code] ) ) { + if ( isset( $unwantedLanguageCodes[$code] ) ) { continue; } $select->addOption( "$code - $lang", $code ); -- To view, visit https://gerrit.wikimedia.org/r/358018 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d67ac3f9fbf341ee6bd84094fb671e97e512dd4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fomafix <foma...@googlemail.com> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits