Fix #3626 further refactor

diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index d3c565e7984fe7365d503f63cf746822ea03db13..e45415fcad4c962773133ffb0d2a4d8031d8ec66 100644 (file)
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -131,16 +131,11 @@ export function defineLocale (name, config) {
 
 export function updateLocale(name, config) {
     if (config != null) {
-        var locale, parentConfig = baseConfig;
+        var locale, tmpLocale, parentConfig = baseConfig;
         // MERGE
-        if (locales[name] != null) {
-            parentConfig = locales[name]._config;
-        }
-        else {
-            locale = loadLocale(name);
-            if (locale != null) {
-                parentConfig = locale._config;
-            }
+        tmpLocale = locales[name] || loadLocale(name);
+        if (tmpLocale != null) {
+            parentConfig = tmpLocale._config;
         }
         config = mergeConfigs(parentConfig, config);
         locale = new Locale(config);