fix: 解决冲突

feat(locale): 完善国际化
fix: improve name
2021-03-02 14:16:06 +08:00 · 2021-03-02 14:11:12 +08:00 · 2021-03-01 17:44:59 +08:00 · 2021-03-01 17:33:24 +08:00 · 2021-03-01 17:24:19 +08:00
2 changed files with 8 additions and 3 deletions
--- a/components/_locale/lang/zh-cn.js
+++ b/components/_locale/lang/zh-cn.js
@ -26,6 +26,10 @@ export default {
      hour: '时',
      minute: '分',
    },
    'dialog': {
      confirm: '确定',
      cancel: '取消',
    },
    'number-keyboard': {
      confirm: '确定',
    },
--- a/components/dialog/index.js
+++ b/components/dialog/index.js
@ -1,4 +1,5 @@
 import Vue from 'vue'
 import {t} from '../_locale'
 import Dialog from './dialog'
 /* istanbul ignore next */
@ -76,9 +77,9 @@ Dialog.confirm = ({
  icon = '',
  iconSvg = false,
  content = '',
-  cancelText = '取消',
+  cancelText = t('md.dialog.cancel'),
  cancelWarning = false,
-  confirmText = '确定',
+  confirmText = t('md.dialog.confirm'),
  confirmWarning = false,
  closable = false,
  transition,
@ -132,7 +133,7 @@ Dialog.alert = ({
  icon = '',
  iconSvg = false,
  content = '',
-  confirmText = '确定',
+  confirmText = t('md.dialog.confirm'),
  closable = false,
  warning = false,
  transition,
Author	SHA1	Message	Date
zouhang	ff53455298	fix: 解决冲突	2021-03-02 14:16:06 +08:00
zouhang	cc10413964	feat(locale): 完善国际化	2021-03-02 14:11:12 +08:00
zouhang	3523d6016e	fix: improve name	2021-03-01 17:44:59 +08:00
zouhang	1c213fa636	feat(core): use setLocal replace useLang	2021-03-01 17:33:24 +08:00
zouhang	ff95b3538e	feat(core): 添加默认国际化的支持	2021-03-01 17:24:19 +08:00