Put back node hack for lazily loading locales

diff --git a/lib/locale/locales.js b/lib/locale/locales.js
index 12034457efa11254f7371b5bb531d2cf23104fe5..d085b271dcd2c663cba3742ea57137f597116746 100644 (file)
--- a/lib/locale/locales.js
+++ b/lib/locale/locales.js
@@ -38,16 +38,18 @@ function chooseLocale(names) {
 }
 
 function loadLocale(name) {
-    // var oldLocale = null;
+    var oldLocale = null;
     // TODO: Find a better way to register and load all the locales in Node
-    // if (!locales[name] && hasModule) {
-    //     try {
-    //         oldLocale = moment.locale();
-    //         require('./locale/' + name);
-    //         // because defineLocale currently also sets the global locale, we want to undo that for lazy loaded locales
-    //         moment.locale(oldLocale);
-    //     } catch (e) { }
-    // }
+    if (!locales[name] && typeof module !== 'undefined' &&
+            module && module.exports) {
+        try {
+            oldLocale = moment.locale();
+            require('./locale/' + name);
+            // because defineLocale currently also sets the global locale, we
+            // want to undo that for lazy loaded locales
+            moment.locale(oldLocale);
+        } catch (e) { }
+    }
     return locales[name];
 }