From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Sun, 17 Jun 2018 16:26:24 +0000 (+0200)
Subject: Only use languages with localisation in the installer
X-Git-Tag: 1.34.0-rc.0~4996^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=4cc7dea1d52d480c62d99d1f2e8665c4cf106f24;p=lhc%2Fweb%2Fwiklou.git

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
---

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 );
 		}