From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 23 May 2015 15:15:58 +0000 (+0000)
Subject: Merge "Check for dependencies in entry point and Maintenance.php"
X-Git-Tag: 1.31.0-rc.0~11322
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=e07ef0b317ed6875634dfb42a3806603688466b7;hp=9880d5b60b6502453c04c7fa69bdc06a5ebc1425;p=lhc%2Fweb%2Fwiklou.git

Merge "Check for dependencies in entry point and Maintenance.php"
---

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index f5cec5454e..e74f226581 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -193,6 +193,7 @@ production.
 * $wgUseTidy is now set when parserTests are run with the tidy option to match
   output on wiki.
 * (T37472) update.php will purge ResourceLoader cache unless --nopurge is passed to it.
+* (T72109) mediawiki.language should respect $wgTranslateNumerals in convertNumber().
 
 === Action API changes in 1.25 ===
 * (T67403) XML tag highlighting is now only performed for formats
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 74164dfb9f..06054eee93 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -78,6 +78,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			'wgServerName' => $conf->get( 'ServerName' ),
 			'wgUserLanguage' => $context->getLanguage(),
 			'wgContentLanguage' => $wgContLang->getCode(),
+			'wgTranslateNumerals' => $conf->get( 'TranslateNumerals' ),
 			'wgVersion' => $conf->get( 'Version' ),
 			'wgEnableAPI' => $conf->get( 'EnableAPI' ),
 			'wgEnableWriteAPI' => $conf->get( 'EnableWriteAPI' ),
diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js b/resources/src/mediawiki.language/mediawiki.language.numbers.js
index c7f150f942..3c13055b7f 100644
--- a/resources/src/mediawiki.language/mediawiki.language.numbers.js
+++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js
@@ -189,6 +189,10 @@
 				transformTable = tmp;
 				numberString = String( num );
 			} else {
+				// Ignore transform table if wgTranslateNumerals is false
+				if ( !mw.config.get( 'wgTranslateNumerals' ) ) {
+					transformTable = [];
+				}
 				numberString = mw.language.commafy( num, pattern );
 			}