Fixing race condition with moment.langData(unloadedLangKey)

diff --git a/moment.js b/moment.js
index 4f54b853f319786b2bac20046265822043d7272c..6677f1c658639768d00838bd273c11785e0df17c 100644 (file)
--- a/moment.js
+++ b/moment.js
@@ -477,6 +477,9 @@
         if (!key) {
             return moment.fn._lang;
         }
+        if (!languages[key] && hasModule) {
+            require('./lang/' + key);
+        }
         return languages[key];
     }
 
@@ -944,8 +947,8 @@
         }
         if (values) {
             loadLang(key, values);
-        } else if (!languages[key] && hasModule) {
-            require('./lang/' + key);
+        } else if (!languages[key]) {
+            getLangDefinition(key);
         }
         moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key);
     };