Locale: compatible vue-i18n, fixed #973

ElemeFE · Nov 16, 2016 · 2241e9f · 2241e9f
1 parent 0013043
commit 2241e9f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/locale/index.js b/src/locale/index.js
@@ -12,7 +12,10 @@ export const t = function(path, options) {
   if (typeof vuei18n === 'function') {
     if (!merged) {
       merged = true;
-      Vue.locale(Vue.config.lang, deepmerge(lang, Vue.locale(Vue.config.lang), { clone: true }));
+      Vue.locale(
+        Vue.config.lang,
+        deepmerge(lang, Vue.locale(Vue.config.lang) || {}, { clone: true })
+      );
     }
     return vuei18n.apply(this, [path, options]);
   }