diff --git a/packages/date-picker/src/basic/date-table.vue b/packages/date-picker/src/basic/date-table.vue index b919ecb30..01e3e1fe4 100644 --- a/packages/date-picker/src/basic/date-table.vue +++ b/packages/date-picker/src/basic/date-table.vue @@ -24,7 +24,7 @@ + v-text="cell.type === 'today' ? $t('datepicker.today') : cell.text"> @@ -214,7 +214,9 @@ }, methods: { - $t: $t, + $t(...args) { + return $t.apply(this, args); + }, getCellClasses(cell) { const selectionMode = this.selectionMode; diff --git a/packages/date-picker/src/basic/month-table.vue b/packages/date-picker/src/basic/month-table.vue index befa42cca..b56a0c497 100644 --- a/packages/date-picker/src/basic/month-table.vue +++ b/packages/date-picker/src/basic/month-table.vue @@ -58,7 +58,9 @@ }, methods: { - $t: $t, + $t(...args) { + return $t.apply(this, args); + }, handleMonthTableClick(event) { const target = event.target; diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue index 4079225dd..3ec185b14 100644 --- a/packages/date-picker/src/panel/date-range.vue +++ b/packages/date-picker/src/panel/date-range.vue @@ -119,12 +119,12 @@ @@ -140,11 +140,11 @@ }, leftLabel() { - return this.date.getFullYear() + '年 ' + (this.date.getMonth() + 1) + '月'; + return this.date.getFullYear() + ' ' + this.$t('datepicker.month') + ' ' + (this.date.getMonth() + 1) + ' ' + this.$t('datepicker.month'); }, rightLabel() { - return this.rightDate.getFullYear() + '年 ' + (this.rightDate.getMonth() + 1) + '月'; + return this.rightDate.getFullYear() + ' ' + this.$t('datepicker.month') + ' ' + (this.rightDate.getMonth() + 1) + ' ' + this.$t('datepicker.month'); }, leftYear() { diff --git a/packages/date-picker/src/panel/date.vue b/packages/date-picker/src/panel/date.vue index 7e185a3e1..f68e0c576 100644 --- a/packages/date-picker/src/panel/date.vue +++ b/packages/date-picker/src/panel/date.vue @@ -15,7 +15,7 @@
@@ -23,7 +23,7 @@ {{ month + 1 }}月 + :class="{ active: currentView === 'month' }">{{ month + 1 }} {{$t('datepicker.month')}} + @click="handleCancel()">{{ $t('datepicker.cancel') }} + :disabled="btnDisabled">{{ $t('datepicker.confirm') }}
diff --git a/packages/date-picker/src/panel/time.vue b/packages/date-picker/src/panel/time.vue index 7448ea643..fa15c319e 100644 --- a/packages/date-picker/src/panel/time.vue +++ b/packages/date-picker/src/panel/time.vue @@ -18,11 +18,11 @@ + @click="handleCancel()">{{ $t('datepicker.cancel') }} + @click="handleConfirm()">{{ $t('datepicker.confirm') }} diff --git a/packages/date-picker/src/util/i18n.js b/packages/date-picker/src/util/i18n.js index 959b29b8a..3d60c4ace 100644 --- a/packages/date-picker/src/util/i18n.js +++ b/packages/date-picker/src/util/i18n.js @@ -1,8 +1,16 @@ export default { datepicker: { - today: '此刻', + now: '此刻', + today: '今天', + cancel: '取消', clear: '清空', confirm: '确定', + selectDate: '选择日期', + selectTime: '选择时间', + startTime: '开始时间', + endTime: '结束时间', + year: '年', + month: '月', week: '周次', weeks: { sun: '日', diff --git a/packages/date-picker/src/util/index.js b/packages/date-picker/src/util/index.js index 5f4e3406f..33146dc42 100644 --- a/packages/date-picker/src/util/index.js +++ b/packages/date-picker/src/util/index.js @@ -176,7 +176,11 @@ export const limitRange = function(date, ranges) { import i18n from './i18n'; -export const $t = function(path) { +export const $t = function(path, options) { + const vuei18n = Object.getPrototypeOf(this).$t; + if (typeof vuei18n === 'function') { + return vuei18n.apply(this, [path, options]); + } const array = path.split('.'); let current = i18n; for (var i = 0, j = array.length; i < j; i++) {