Fix moment#3626 further refactor

cmyers · Nov 14, 2017 · 627919d · 627919d
1 parent 13c041f
commit 627919d
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
@@ -133,16 +133,10 @@ export function updateLocale(name, config) {
     if (config != null) {
         var locale, tmpLocale, parentConfig = baseConfig;
         // MERGE
-        tmpLocale = loadLocale(name);
+        tmpLocale = locales[name] || loadLocale(name);
         if (tmpLocale != null) {
             parentConfig = tmpLocale._config;
         }
-        else {
-            locale = loadLocale(name);
-            if (locale != null) {
-                parentConfig = locale._config;
-            }
-        }
         config = mergeConfigs(parentConfig, config);
         locale = new Locale(config);
         locale.parentLocale = locales[name];