aboutsummaryrefslogtreecommitdiff
path: root/node_modules/moment/src/lib/locale
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-12-10 21:51:33 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-12-10 21:51:33 +0100
commit0469abd4a9c9270a1fdc962969e36e63699af8b4 (patch)
treef9864d4a4148621378958794cbbfdc2393733283 /node_modules/moment/src/lib/locale
parent6947e79bbc258f7bc96af424ddb71a511f0c15a3 (diff)
upgrade dependencies
Diffstat (limited to 'node_modules/moment/src/lib/locale')
-rw-r--r--node_modules/moment/src/lib/locale/locales.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/node_modules/moment/src/lib/locale/locales.js b/node_modules/moment/src/lib/locale/locales.js
index 4efebb8ff..7d8fb26e0 100644
--- a/node_modules/moment/src/lib/locale/locales.js
+++ b/node_modules/moment/src/lib/locale/locales.js
@@ -131,10 +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;
+ tmpLocale = loadLocale(name);
+ if (tmpLocale != null) {
+ parentConfig = tmpLocale._config;
}
config = mergeConfigs(parentConfig, config);
locale = new Locale(config);