From 2241e9f2b4d3cc11f1bb4026413bfb773bc1fbe0 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Wed, 16 Nov 2016 12:06:24 +0800
Subject: [PATCH] Locale: compatible vue-i18n, fixed #973

---
 src/locale/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/locale/index.js b/src/locale/index.js
index 8dee35e0b..49b200792 100644
--- 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]);
   }