jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.language.init: Ignore case of language code
......................................................................
mediawiki.language.init: Ignore case of language code
This allows capitalization suggested by BCP 47 without the risk
of duplicate entries.
Change-Id: I0ebdead5440862c087920fa93e85aeb47464272e
---
M resources/src/mediawiki.language/mediawiki.language.init.js
M tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.language/mediawiki.language.init.js
b/resources/src/mediawiki.language/mediawiki.language.init.js
index df95d75..b3765c8 100644
--- a/resources/src/mediawiki.language/mediawiki.language.init.js
+++ b/resources/src/mediawiki.language/mediawiki.language.init.js
@@ -54,6 +54,7 @@
*/
getData: function ( langCode, dataKey ) {
var langData = mw.language.data;
+ langCode = langCode.toLowerCase();
if ( langData && langData[langCode] instanceof mw.Map )
{
return langData[langCode].get( dataKey );
}
@@ -71,6 +72,7 @@
*/
setData: function ( langCode, dataKey, value ) {
var langData = mw.language.data;
+ langCode = langCode.toLowerCase();
if ( !( langData[langCode] instanceof mw.Map ) ) {
langData[langCode] = new mw.Map();
}
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 16f90df..a068846 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -11,10 +11,12 @@
}
} ) );
- QUnit.test( 'mw.language getData and setData', 2, function ( assert ) {
+ QUnit.test( 'mw.language getData and setData', 3, function ( assert ) {
mw.language.setData( 'en', 'testkey', 'testvalue' );
assert.equal( mw.language.getData( 'en', 'testkey' ),
'testvalue', 'Getter setter test for mw.language' );
assert.equal( mw.language.getData( 'en', 'invalidkey' ),
undefined, 'Getter setter test for mw.language with invalid key' );
+ mw.language.setData( 'en-us', 'testkey', 'testvalue' );
+ assert.equal( mw.language.getData( 'en-US', 'testkey' ),
'testvalue', 'Case insensitive test for mw.language' );
} );
QUnit.test( 'mw.language.commafy test', 9, function ( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/188520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ebdead5440862c087920fa93e85aeb47464272e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
