From 8930367486f17bcc1c8df1f7e420b56d468881ac Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Tue, 26 Sep 2017 22:22:57 +0200 Subject: [PATCH 1/3] add weekStartDay to Locale files --- src/locale/lang/de-DE.js | 3 ++- src/locale/lang/en-US.js | 5 +++-- src/locale/lang/es-ES.js | 1 + src/locale/lang/fr-FR.js | 1 + src/locale/lang/id-ID.js | 3 ++- src/locale/lang/ja-JP.js | 3 ++- src/locale/lang/ko-KR.js | 3 ++- src/locale/lang/pt-BR.js | 3 ++- src/locale/lang/pt-PT.js | 1 + src/locale/lang/ru-RU.js | 3 ++- src/locale/lang/sv-SE.js | 1 + src/locale/lang/tr-TR.js | 1 + src/locale/lang/vi-VN.js | 1 + src/locale/lang/zh-CN.js | 3 ++- src/locale/lang/zh-TW.js | 3 ++- 15 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/locale/lang/de-DE.js b/src/locale/lang/de-DE.js index 6b79654a..7dbf08aa 100644 --- a/src/locale/lang/de-DE.js +++ b/src/locale/lang/de-DE.js @@ -33,6 +33,7 @@ export default { month11: 'November', month12: 'Dezember', year: '', + weekStartDay: '1', weeks: { sun: 'So', mon: 'Mo', @@ -93,4 +94,4 @@ export default { emptyText: 'Keine Daten' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js index 9de431f1..34608c09 100644 --- a/src/locale/lang/en-US.js +++ b/src/locale/lang/en-US.js @@ -32,7 +32,8 @@ export default { month10: 'October', month11: 'November', month12: 'December', - year: '', + year: 'Year', + weekStartDay: '0', weeks: { sun: 'Sun', mon: 'Mon', @@ -93,4 +94,4 @@ export default { emptyText: 'No Data' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/es-ES.js b/src/locale/lang/es-ES.js index 4c4d813c..7dc94dd6 100644 --- a/src/locale/lang/es-ES.js +++ b/src/locale/lang/es-ES.js @@ -33,6 +33,7 @@ export default { month11: 'Noviembre', month12: 'Deciembre', year: 'Año', + weekStartDay: '1', weeks: { sun: 'Domingo', mon: 'Lunes', diff --git a/src/locale/lang/fr-FR.js b/src/locale/lang/fr-FR.js index f31ef297..9dd818e3 100644 --- a/src/locale/lang/fr-FR.js +++ b/src/locale/lang/fr-FR.js @@ -33,6 +33,7 @@ export default { month11: 'Novembre', month12: 'Decembre', year: '', + weekStartDay: '1', weeks: { sun: 'Dim', mon: 'Lun', diff --git a/src/locale/lang/id-ID.js b/src/locale/lang/id-ID.js index 4475986f..a64a4f2b 100644 --- a/src/locale/lang/id-ID.js +++ b/src/locale/lang/id-ID.js @@ -33,6 +33,7 @@ export default { month11: 'November', month12: 'Desember', year: '', + weekStartDay: '1', weeks: { sun: 'Min', mon: 'Sen', @@ -93,4 +94,4 @@ export default { emptyText: 'Tidak ada data' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/ja-JP.js b/src/locale/lang/ja-JP.js index bcad1496..df641bec 100644 --- a/src/locale/lang/ja-JP.js +++ b/src/locale/lang/ja-JP.js @@ -33,6 +33,7 @@ export default { month11: '11 月', month12: '12 月', year: '年', + weekStartDay: '0', weeks: { sun: '日', mon: '月', @@ -93,4 +94,4 @@ export default { emptyText: 'データなし' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/ko-KR.js b/src/locale/lang/ko-KR.js index d4961094..3149e85e 100644 --- a/src/locale/lang/ko-KR.js +++ b/src/locale/lang/ko-KR.js @@ -33,6 +33,7 @@ export default { month11: '11월', month12: '12월', year: '년', + weekStartDay: '0', weeks: { sun: '일', mon: '월', @@ -93,4 +94,4 @@ export default { emptyText: '데이터 없음' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/pt-BR.js b/src/locale/lang/pt-BR.js index 7dc066de..568e501d 100644 --- a/src/locale/lang/pt-BR.js +++ b/src/locale/lang/pt-BR.js @@ -33,6 +33,7 @@ export default { month11: 'Novembro', month12: 'Dezembro', year: 'Ano', + weekStartDay: '0', weeks: { sun: 'Dom', mon: 'Seg', @@ -93,4 +94,4 @@ export default { emptyText: 'Sem dados' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/pt-PT.js b/src/locale/lang/pt-PT.js index e61573a8..5f8a147b 100644 --- a/src/locale/lang/pt-PT.js +++ b/src/locale/lang/pt-PT.js @@ -33,6 +33,7 @@ export default { month11: 'Novembro', month12: 'Dezembro', year: 'Ano', + weekStartDay: '1', weeks: { sun: 'Dom', mon: 'Seg', diff --git a/src/locale/lang/ru-RU.js b/src/locale/lang/ru-RU.js index 7a2691d1..c0f9b114 100644 --- a/src/locale/lang/ru-RU.js +++ b/src/locale/lang/ru-RU.js @@ -33,6 +33,7 @@ export default { month11: 'Ноябрь', month12: 'Декабрь', year: '', + weekStartDay: '1', weeks: { sun: 'Вс', mon: 'Пн', @@ -93,4 +94,4 @@ export default { emptyText: 'Нет данных' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/sv-SE.js b/src/locale/lang/sv-SE.js index 8a52e24e..367a0f6c 100644 --- a/src/locale/lang/sv-SE.js +++ b/src/locale/lang/sv-SE.js @@ -33,6 +33,7 @@ export default { month11: 'November', month12: 'December', year: 'År', + weekStartDay: '1', weeks: { sun: 'Sön', mon: 'Mån', diff --git a/src/locale/lang/tr-TR.js b/src/locale/lang/tr-TR.js index ed95c980..b0c9098c 100644 --- a/src/locale/lang/tr-TR.js +++ b/src/locale/lang/tr-TR.js @@ -33,6 +33,7 @@ export default { month11: 'Kasım', month12: 'Aralık', year: '', + weekStartDay: '0', weeks: { sun: 'Paz', mon: 'Pzt', diff --git a/src/locale/lang/vi-VN.js b/src/locale/lang/vi-VN.js index 9505be66..53a80f4a 100644 --- a/src/locale/lang/vi-VN.js +++ b/src/locale/lang/vi-VN.js @@ -33,6 +33,7 @@ export default { month11: 'Tháng 11', month12: 'Tháng 12', year: '', + weekStartDay: '1', weeks: { sun: 'CN', mon: 'T2', diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js index ea87ebcb..2b85680a 100644 --- a/src/locale/lang/zh-CN.js +++ b/src/locale/lang/zh-CN.js @@ -33,6 +33,7 @@ export default { month11: '11 月', month12: '12 月', year: '年', + weekStartDay: '0', weeks: { sun: '日', mon: '一', @@ -93,4 +94,4 @@ export default { emptyText: '暂无数据' } } -}; \ No newline at end of file +}; diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js index b9e45cc2..cfcf2754 100644 --- a/src/locale/lang/zh-TW.js +++ b/src/locale/lang/zh-TW.js @@ -33,6 +33,7 @@ export default { month11: '11 月', month12: '12 月', year: '年', + weekStartDay: '0', weeks: { sun: '日', mon: '一', @@ -93,4 +94,4 @@ export default { emptyText: '暫無數據' } } -}; \ No newline at end of file +}; From 0916642089f3a9c3e45ac3914d945bd0b5ae70d5 Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Tue, 26 Sep 2017 22:25:16 +0200 Subject: [PATCH 2/3] add weekStartDay logic to date-table --- src/components/date-picker/base/date-table.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/date-picker/base/date-table.vue b/src/components/date-picker/base/date-table.vue index ad499a13..a8a64c5f 100644 --- a/src/components/date-picker/base/date-table.vue +++ b/src/components/date-picker/base/date-table.vue @@ -89,8 +89,8 @@ }, cells () { const date = new Date(this.year, this.month, 1); - let day = getFirstDayOfMonth(date); // day of first day - day = (day === 0 ? 7 : day); + const weekStartDay = Number(this.t('i.datepicker.weekStartDay')); + const day = (getFirstDayOfMonth(date) || 7) - weekStartDay; // day of first day const today = clearHours(new Date()); // timestamp of today const selectDay = clearHours(new Date(this.value)); // timestamp of selected day const minDay = clearHours(new Date(this.minDate)); From 3ecbf20343e452abd12d85eb5fce229c9068c544 Mon Sep 17 00:00:00 2001 From: Aresn Date: Wed, 27 Sep 2017 02:01:14 -0500 Subject: [PATCH 3/3] Update en-US.js It's better to be empty here --- src/locale/lang/en-US.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js index 34608c09..b91f501e 100644 --- a/src/locale/lang/en-US.js +++ b/src/locale/lang/en-US.js @@ -32,7 +32,7 @@ export default { month10: 'October', month11: 'November', month12: 'December', - year: 'Year', + year: '', weekStartDay: '0', weeks: { sun: 'Sun',