From: Chris Myers <cmyers2015@outlook.com>
Date: Sat, 14 Oct 2017 23:28:34 +0000 (+0100)
Subject: Fix #3626: updateLocale merge issue
X-Git-Tag: 2.19.2~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9756e862badcdfe2a48e8bfc1c56cb91593d8baf;p=thirdparty%2Fmoment.git

Fix #3626: updateLocale merge issue
---

diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
index 4efebb8ff..d3c565e79 100644
--- a/src/lib/locale/locales.js
+++ b/src/lib/locale/locales.js
@@ -136,6 +136,12 @@ export function updateLocale(name, config) {
         if (locales[name] != null) {
             parentConfig = locales[name]._config;
         }
+        else {
+            locale = loadLocale(name);
+            if (locale != null) {
+                parentConfig = locale._config;
+            }
+        }
         config = mergeConfigs(parentConfig, config);
         locale = new Locale(config);
         locale.parentLocale = locales[name];