Normalize language identifiers as described in #963

diff --git a/moment.js b/moment.js
index 520b5b9050b966871e5af03c5496be8de32cd29a..fe9df98a1b1c122176ae123ec6834069b21cd57f 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -1137,6 +1137,8 @@
         if (!key) {
             return moment.fn._lang._abbr;
         }
+        key = key.toLowerCase();
+        key = key.replace('_', '-');
         if (values) {
             loadLang(key, values);
         } else if (values === null) {

diff --git a/test/moment/lang.js b/test/moment/lang.js
index ee0cb5e2fac0ae0850f51879a02569bc7c488cd3..74942171a5559155ba8f047388cac95261e58ea7 100644 (file)
--- a/test/moment/lang.js
+++ b/test/moment/lang.js
@@ -2,7 +2,7 @@ var moment = require("../../moment");
 
 exports.lang = {
     "library getter" : function (test) {
-        test.expect(5);
+        test.expect(7);
 
         moment.lang('en');
         test.equal(moment.lang(), 'en', 'Lang should return en by default');
@@ -19,6 +19,12 @@ exports.lang = {
         moment.lang('does-not-exist');
         test.equal(moment.lang(), 'en', 'Lang should reset');
 
+        moment.lang('EN');
+        test.equal(moment.lang(), 'en', 'Normalize language key case');
+
+        moment.lang('EN_gb');
+        test.equal(moment.lang(), 'en-gb', 'Normalize language key underscore');
+
         test.done();
     },