Skip to content

Commit

Permalink
Fix moment#3626: updateLocale merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
cmyers committed Oct 14, 2017
1 parent 29afed6 commit 61a556f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/lib/locale/locales.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 61a556f

Please sign in to comment.