From 8181a08cf4b96bc69fa0b998e6953b62d43cdc04 Mon Sep 17 00:00:00 2001
From: zazzaz <izazzaz@hotmail.com>
Date: Wed, 18 Nov 2020 22:20:36 +0800
Subject: [PATCH] fix: locale update bug (#611)

---
 packages/popconfirm/src/index.vue | 17 +++++++++++------
 packages/select/src/select.vue    |  3 +--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/popconfirm/src/index.vue b/packages/popconfirm/src/index.vue
index a031367500..de50d5cbcd 100644
--- a/packages/popconfirm/src/index.vue
+++ b/packages/popconfirm/src/index.vue
@@ -21,14 +21,14 @@
           :type="cancelButtonType"
           @click="cancel"
         >
-          {{ cancelButtonText }}
+          {{ cancelButtonText_ }}
         </el-button>
         <el-button
           size="mini"
           :type="confirmButtonType"
           @click="confirm"
         >
-          {{ confirmButtonText }}
+          {{ confirmButtonText_ }}
         </el-button>
       </div>
     </div>
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent,ref } from 'vue'
+import { defineComponent, ref, computed } from 'vue'
 import { Button as ElButton } from '@element-plus/button'
 import { Popper as ElPopper } from '@element-plus/popper'
 import { t } from '../../locale'
@@ -58,11 +58,9 @@ export default defineComponent({
     },
     confirmButtonText: {
       type: String,
-      default: t('el.popconfirm.confirmButtonText'),
     },
     cancelButtonText: {
       type: String,
-      default: t('el.popconfirm.cancelButtonText'),
     },
     confirmButtonType: {
       type: String,
@@ -96,11 +94,18 @@ export default defineComponent({
       visible.value = false
       emit('cancel')
     }
-
+    const confirmButtonText_ = computed(() => {
+      return props.confirmButtonText || t('el.popconfirm.confirmButtonText')
+    })
+    const cancelButtonText_ = computed(() => {
+      return props.cancelButtonText || t('el.popconfirm.cancelButtonText')
+    })
     return {
       visible,
       confirm,
       cancel,
+      confirmButtonText_,
+      cancelButtonText_,
     }
   },
 })
diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
index b47bfb91e4..0e3615f18c 100644
--- a/packages/select/src/select.vue
+++ b/packages/select/src/select.vue
@@ -239,7 +239,6 @@ export default defineComponent({
     },
     placeholder: {
       type: String,
-      default: t('el.select.placeholder'),
     },
     defaultFirstOption: Boolean,
     reserveKeyword: Boolean,
@@ -342,7 +341,7 @@ export default defineComponent({
     }))
 
     onMounted(() => {
-      states.cachedPlaceHolder = currentPlaceholder.value = props.placeholder
+      states.cachedPlaceHolder = currentPlaceholder.value = (props.placeholder || t('el.select.placeholder'))
       if (props.multiple && Array.isArray(props.modelValue) && props.modelValue.length > 0) {
         currentPlaceholder.value = ''
       }