From 4cc7dea1d52d480c62d99d1f2e8665c4cf106f24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sun, 17 Jun 2018 18:26:24 +0200 Subject: [PATCH] Only use languages with localisation in the installer To match recent change to Special:Preferences, only allow languages with localisation as interface or content language. Bug: T188030 Change-Id: I8acae47ee70feb98bcde982d9b0e3637daf96ffb --- includes/installer/WebInstaller.php | 2 +- includes/installer/WebInstallerLanguage.php | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index 018754bcfb..4836c14f75 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -529,7 +529,7 @@ class WebInstaller extends Installer { public function getAcceptLanguage() { global $wgLanguageCode, $wgRequest; - $mwLanguages = Language::fetchLanguageNames(); + $mwLanguages = Language::fetchLanguageNames( null, 'mwfile' ); $headerLanguages = array_keys( $wgRequest->getAcceptLang() ); foreach ( $headerLanguages as $lang ) { diff --git a/includes/installer/WebInstallerLanguage.php b/includes/installer/WebInstallerLanguage.php index 846be6ccb6..85d1a2df60 100644 --- a/includes/installer/WebInstallerLanguage.php +++ b/includes/installer/WebInstallerLanguage.php @@ -30,7 +30,7 @@ class WebInstallerLanguage extends WebInstallerPage { $userLang = $r->getVal( 'uselang' ); $contLang = $r->getVal( 'ContLang' ); - $languages = Language::fetchLanguageNames(); + $languages = Language::fetchLanguageNames( null, 'mwfile' ); $lifetime = intval( ini_get( 'session.gc_maxlifetime' ) ); if ( !$lifetime ) { $lifetime = 1440; // PHP default @@ -98,20 +98,13 @@ class WebInstallerLanguage extends WebInstallerPage { * @return string */ public function getLanguageSelector( $name, $label, $selectedCode, $helpHtml = '' ) { - global $wgExtraLanguageCodes; - $output = $helpHtml; $select = new XmlSelect( $name, $name, $selectedCode ); $select->setAttribute( 'tabindex', $this->parent->nextTabIndex() ); - $unwantedLanguageCodes = $wgExtraLanguageCodes + - LanguageCode::getDeprecatedCodeMapping(); - $languages = Language::fetchLanguageNames(); + $languages = Language::fetchLanguageNames( null, 'mwfile' ); foreach ( $languages as $code => $lang ) { - if ( isset( $unwantedLanguageCodes[$code] ) ) { - continue; - } $select->addOption( "$code - $lang", $code ); } -- 2.20.1