Put back node hack for lazily loading locales

claireksnyk · Mar 25, 2015 · 5fb4720 · 5fb4720
1 parent 3676152
commit 5fb4720
Showing 1 changed file with 11 additions and 9 deletions.
diff --git 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];
 }