From a13b49b609f9388c20d629ce430e856009bebd13 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Thu, 17 Nov 2016 15:37:04 +0800
Subject: [PATCH] Locale: fix dynamic change locale

---
 packages/message-box/src/main.js  | 11 +++--------
 packages/message-box/src/main.vue | 18 +++++++++---------
 packages/select/src/select.vue    |  4 +++-
 packages/table/src/table.vue      |  4 +++-
 packages/tree/src/tree.vue        |  4 +++-
 src/locale/lang/en.js             |  1 +
 src/locale/lang/zh-CN.js          |  1 +
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/message-box/src/main.js b/packages/message-box/src/main.js
index f1f8fe32e..a63299217 100644
--- a/packages/message-box/src/main.js
+++ b/packages/message-box/src/main.js
@@ -1,10 +1,5 @@
-import { t } from 'element-ui/src/locale';
-
-const CONFIRM_TEXT = t('el.messagebox.confirm');
-const CANCEL_TEXT = t('el.messagebox.cancel');
-
 const defaults = {
-  title: '提示',
+  title: undefined,
   message: '',
   type: '',
   showInput: false,
@@ -22,8 +17,8 @@ const defaults = {
   confirmButtonPosition: 'right',
   confirmButtonHighlight: false,
   cancelButtonHighlight: false,
-  confirmButtonText: CONFIRM_TEXT,
-  cancelButtonText: CANCEL_TEXT,
+  confirmButtonText: '',
+  cancelButtonText: '',
   confirmButtonClass: '',
   cancelButtonClass: ''
 };
diff --git a/packages/message-box/src/main.vue b/packages/message-box/src/main.vue
index 38e2bdf1b..95cf8b756 100644
--- a/packages/message-box/src/main.vue
+++ b/packages/message-box/src/main.vue
@@ -2,8 +2,8 @@
   <transition name="msgbox-fade">
     <div class="el-message-box__wrapper" v-show="value" @click.self="handleWrapperClick">
       <div class="el-message-box">
-        <div class="el-message-box__header" v-if="title !== ''">
-          <div class="el-message-box__title">{{ title }}</div>
+        <div class="el-message-box__header" v-if="title !== undefined">
+          <div class="el-message-box__title">{{ title || t('el.messagebox.title') }}</div>
           <i class="el-message-box__close el-icon-close" @click="handleAction('cancel')" v-if="showClose"></i>
         </div>
         <div class="el-message-box__content" v-if="message !== ''">
@@ -15,8 +15,8 @@
           </div>
         </div>
         <div class="el-message-box__btns">
-          <el-button :class="[ cancelButtonClasses ]" v-show="showCancelButton" @click.native="handleAction('cancel')">{{ cancelButtonText }}</el-button>
-          <el-button ref="confirm" :class="[ confirmButtonClasses ]" v-show="showConfirmButton" @click.native="handleAction('confirm')">{{ confirmButtonText }}</el-button>
+          <el-button :class="[ cancelButtonClasses ]" v-show="showCancelButton" @click.native="handleAction('cancel')">{{ cancelButtonText || t('el.messagebox.cancel') }}</el-button>
+          <el-button ref="confirm" :class="[ confirmButtonClasses ]" v-show="showConfirmButton" @click.native="handleAction('confirm')">{{ confirmButtonText || t('el.messagebox.confirm') }}</el-button>
         </div>
       </div>
     </div>
@@ -25,6 +25,7 @@
 
 <script type="text/babel">
   import Popup from 'vue-popup';
+  import Locale from 'element-ui/src/mixins/locale';
   import ElInput from 'element-ui/packages/input';
   import ElButton from 'element-ui/packages/button';
   import { addClass, removeClass } from 'wind-dom/src/class';
@@ -38,7 +39,7 @@
   };
 
   export default {
-    mixins: [Popup],
+    mixins: [Popup, Locale],
 
     props: {
       modal: {
@@ -173,7 +174,7 @@
 
     data() {
       return {
-        title: '',
+        title: undefined,
         message: '',
         type: '',
         showInput: false,
@@ -184,12 +185,11 @@
         inputErrorMessage: '',
         showConfirmButton: true,
         showCancelButton: false,
-        confirmButtonText: t('el.messagebox.confirm'),
-        cancelButtonText: t('el.messagebox.cancel'),
+        confirmButtonText: '',
+        cancelButtonText: '',
         confirmButtonClass: '',
         confirmButtonDisabled: false,
         cancelButtonClass: '',
-
         editorErrorMessage: null,
         callback: null
       };
diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
index 724d2c84f..e58e7a3fe 100644
--- a/packages/select/src/select.vue
+++ b/packages/select/src/select.vue
@@ -149,7 +149,9 @@
       multiple: Boolean,
       placeholder: {
         type: String,
-        default: t('el.select.placeholder')
+        default() {
+          return t('el.select.placeholder');
+        }
       }
     },
 
diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue
index 3f1d4ee2e..d874e491f 100644
--- a/packages/table/src/table.vue
+++ b/packages/table/src/table.vue
@@ -137,7 +137,9 @@
 
       emptyText: {
         type: String,
-        default: t('el.table.emptyText')
+        default() {
+          return t('el.table.emptyText');
+        }
       }
     },
 
diff --git a/packages/tree/src/tree.vue b/packages/tree/src/tree.vue
index dc15e915a..8baf16d29 100644
--- a/packages/tree/src/tree.vue
+++ b/packages/tree/src/tree.vue
@@ -25,7 +25,9 @@
       },
       emptyText: {
         type: String,
-        default: t('el.tree.emptyText')
+        default() {
+          return t('el.tree.emptyText');
+        }
       },
       nodeKey: String,
       checkStrictly: Boolean,
diff --git a/src/locale/lang/en.js b/src/locale/lang/en.js
index fe4028a5e..c8b63b5af 100644
--- a/src/locale/lang/en.js
+++ b/src/locale/lang/en.js
@@ -63,6 +63,7 @@ export default {
       pageClassifier: ''
     },
     messagebox: {
+      title: 'Message',
       confirm: 'OK',
       cancel: 'Cancel',
       error: 'Illegal input'
diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
index e413bddf9..ce927f132 100644
--- a/src/locale/lang/zh-CN.js
+++ b/src/locale/lang/zh-CN.js
@@ -63,6 +63,7 @@ export default {
       pageClassifier: '页'
     },
     messagebox: {
+      title: '提示',
       confirm: '确定',
       cancel: '取消',
       error: '输入的数据不合法!'