Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189205
Change subject: Convert all language codes for JavaScript with wfBCP47
......................................................................
Convert all language codes for JavaScript with wfBCP47
For the HTML attribute lang the PHP function wfBCP47 is already applied.
This allows to generate HTML from JavaScript with the same values like in PHP.
This avoids to reimplement wfBCP47 in JavaScript.
This ensures to have the same representation in HTML and JavaScript.
Change-Id: I9db7a1828f9bbb174f5c30e6f3d136fcde46af94
---
M includes/OutputPage.php
M includes/resourceloader/ResourceLoader.php
M includes/resourceloader/ResourceLoaderLanguageDataModule.php
M includes/resourceloader/ResourceLoaderLanguageNamesModule.php
M includes/resourceloader/ResourceLoaderStartUpModule.php
5 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/189205/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5c146e4..6687569 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3189,7 +3189,7 @@
'wgUserGroups' => $user->getEffectiveGroups(),
'wgCategories' => $this->getCategories(),
'wgBreakFrames' => $this->getFrameOptions() == 'DENY',
- 'wgPageContentLanguage' => $lang->getCode(),
+ 'wgPageContentLanguage' => $lang->getHtmlCode(),
'wgPageContentModel' => $title->getContentModel(),
'wgSeparatorTransformTable' =>
$compactSeparatorTransTable,
'wgDigitTransformTable' => $compactDigitTransTable,
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index 15bb13f..f65f50f 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1481,7 +1481,7 @@
) {
$query = array(
'modules' => self::makePackedModulesString( $modules ),
- 'lang' => $lang,
+ 'lang' => wfBCP47( $lang ),
'skin' => $skin,
'debug' => $debug ? 'true' : 'false',
);
diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index 1239453..a9595c7 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -55,7 +55,7 @@
return Xml::encodeJsCall(
'mw.language.setData',
array(
- $context->getLanguage(),
+ wfBCP47( $context->getLanguage() ),
$this->getData( $context )
),
ResourceLoader::inDebugMode()
diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 55b1f4b..b6ff3b9 100644
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -52,7 +52,7 @@
return Xml::encodeJsCall(
'mw.language.setData',
array(
- $context->getLanguage(),
+ wfBCP47( $context->getLanguage() ),
'languageNames',
$this->getData( $context )
),
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php
b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 48b3576..dceb42d 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -80,8 +80,8 @@
'wgActionPaths' => (object)$conf->get( 'ActionPaths' ),
'wgServer' => $conf->get( 'Server' ),
'wgServerName' => $conf->get( 'ServerName' ),
- 'wgUserLanguage' => $context->getLanguage(),
- 'wgContentLanguage' => $wgContLang->getCode(),
+ 'wgUserLanguage' => wfBCP47( $context->getLanguage() ),
+ 'wgContentLanguage' => $wgContLang->getHtmlCode(),
'wgVersion' => $conf->get( 'Version' ),
'wgEnableAPI' => $conf->get( 'EnableAPI' ),
'wgEnableWriteAPI' => $conf->get( 'EnableWriteAPI' ),
--
To view, visit https://gerrit.wikimedia.org/r/189205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9db7a1828f9bbb174f5c30e6f3d136fcde46af94
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
