Fix moment().locale('ivalid-id')

diff --git a/moment.js b/moment.js
index 868206aadfba8555ad22a6522ecc9517ee7bcba6..3b5d65adc3185d0104ffe0b6e4d0ae3673d0f1d1 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -2448,10 +2448,15 @@
         // instance.  Otherwise, it will return the locale configuration
         // variables for this instance.
         locale : function (key) {
+            var newLocaleData;
+
             if (key === undefined) {
                 return this._locale._abbr;
             } else {
-                this._locale = moment.localeData(key);
+                newLocaleData = moment.localeData(key);
+                if (newLocaleData != null) {
+                    this._locale = newLocaleData;
+                }
                 return this;
             }
         },
@@ -2462,8 +2467,7 @@
                 if (key === undefined) {
                     return this.localeData();
                 } else {
-                    this._locale = moment.localeData(key);
-                    return this;
+                    return this.locale(key);
                 }
             }
         ),

diff --git a/test/moment/locale.js b/test/moment/locale.js
index bf0bcdefbc1235ee2607758643b73af7419e13ff..57ecb4ae9d9d39bb2a9338f94aafa1b58866797e 100644 (file)
--- a/test/moment/locale.js
+++ b/test/moment/locale.js
@@ -458,5 +458,17 @@ exports.locale = {
         test.equal(m.locale(), 'fr', 'instance locale reset to global locale');
 
         test.done();
+    },
+
+    'moment().locale with missing key doesn\'t change locale' : function (test) {
+        test.equal(moment().locale('boo').localeData(), moment.localeData(),
+                'preserve global locale in case of bad locale id');
+        test.done();
+    },
+
+    'moment().lang with missing key doesn\'t change locale' : function (test) {
+        test.equal(moment().lang('boo').localeData(), moment.localeData(),
+                'preserve global locale in case of bad locale id');
+        test.done();
     }
 };