github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2237 from fntneves/fn-fix-datepicker-translation 

DatePicker: Fix year label space in year picker
pull/2263/head
baiyaaaaa 2017-01-06 16:00:10 +08:00 committed by GitHub
parent 7539325eb5 cbce532ab4
commit 0b524682f1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/date-picker/src/panel/date.vue
View File

@ -436,7 +436,10 @@
const yearTranslation = this.t('el.datepicker.year');
if (this.currentView === 'year') {
const startYear = Math.floor(year / 10) * 10;
return startYear + ' ' + yearTranslation + '-' + (startYear + 9) + ' ' + yearTranslation;
if (yearTranslation) {
return startYear + ' ' + yearTranslation + ' - ' + (startYear + 9) + ' ' + yearTranslation;
}
return startYear + ' - ' + (startYear + 9);
}
return this.year + ' ' + yearTranslation;
}