Navigation Menu

Skip to content

Commit

Permalink
Revert "Merge pull request #3344 from yiminghe:module_require"
Browse files Browse the repository at this point in the history
This reverts commit bb6a30e, reversing
changes made to d4c5f8e.
  • Loading branch information
ichernev committed Sep 21, 2016
1 parent e90e864 commit b8042c6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/lib/locale/locales.js
Expand Up @@ -48,10 +48,10 @@ function loadLocale(name) {
var oldLocale = null;
// TODO: Find a better way to register and load all the locales in Node
if (!locales[name] && (typeof module !== 'undefined') &&
module && module.require) {
module && module.exports) {
try {
oldLocale = globalLocale._abbr;
module.require('./locale/' + name);
require('./locale/' + name);
// because defineLocale currently also sets the global locale, we
// want to undo that for lazy loaded locales
getSetGlobalLocale(oldLocale);
Expand Down

0 comments on commit b8042c6

Please sign in to comment.