Merge "mediawiki.language.init: Ignore case of language code"

diff --git a/resources/src/mediawiki.language/mediawiki.language.init.js b/resources/src/mediawiki.language/mediawiki.language.init.js
index df95d75..b3765c8 100644 (file)
--- 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 (file)
--- 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 ) {