fix(ui): merge locales

vuejs · Apr 30, 2018 · ae552a9 · ae552a9
1 parent 9d87b35
commit ae552a9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/packages/@vue/cli-ui/src/graphql-api/connectors/locales.js b/packages/@vue/cli-ui/src/graphql-api/connectors/locales.js
@@ -1,6 +1,7 @@
 const path = require('path')
 const fs = require('fs')
 const globby = require('globby')
+const deepmerge = require('deepmerge')
 // Connectors
 const cwd = require('./cwd')
 // Subs
@@ -17,9 +18,13 @@ function list (context) {
  return locales
 }
 
-function add ({ lang, strings }, context) {
- const locale = { lang, strings }
- locales.push(locale)
+function add (locale, context) {
+ const existing = locales.find(l => l.lang === locale.lang)
+ if (existing) {
+ existing.strings = deepmerge(existing.strings, locale.strings)
+ } else {
+ locales.push(locale)
+ }
  context.pubsub.publish(channels.LOCALE_ADDED, {
  localeAdded: locale
  })