From 7a9c1ae0f6985659539d941c6e793f455fb8a719 Mon Sep 17 00:00:00 2001
From: David Morrow <dperrymorrow@gmail.com>
Date: Fri, 14 Jun 2013 11:17:38 -0700
Subject: [PATCH] If lang requested not found, resort to default lang

in response to Issue #844
---
 moment.js           | 7 ++++++-
 test/moment/lang.js | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/moment.js b/moment.js
index f6176b6de..34e455dd8 100644
--- a/moment.js
+++ b/moment.js
@@ -591,7 +591,12 @@
             return moment.fn._lang;
         }
         if (!languages[key] && hasModule) {
-            require('./lang/' + key);
+            try {
+                require('./lang/' + key);
+            } catch (e) {
+                // call with no params to set to default
+                return moment.fn._lang;
+            }
         }
         return languages[key];
     }
diff --git a/test/moment/lang.js b/test/moment/lang.js
index a3e5afb83..ee0cb5e2f 100644
--- 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(4);
+        test.expect(5);
 
         moment.lang('en');
         test.equal(moment.lang(), 'en', 'Lang should return en by default');
@@ -16,6 +16,9 @@ exports.lang = {
         moment.lang('en');
         test.equal(moment.lang(), 'en', 'Lang should reset');
 
+        moment.lang('does-not-exist');
+        test.equal(moment.lang(), 'en', 'Lang should reset');
+
         test.done();
     },
 
-- 
2.47.2