From c75fe4fad5b4236882da53b761061bc9fb844682 Mon Sep 17 00:00:00 2001 From: Manash Sonowal Date: Thu, 16 Nov 2017 21:20:38 +0530 Subject: [PATCH 1/5] added confirm_text as language local --- datepicker/languages.js | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/datepicker/languages.js b/datepicker/languages.js index eb2c9d2..b333f42 100644 --- a/datepicker/languages.js +++ b/datepicker/languages.js @@ -6,7 +6,8 @@ export default { 'placeholder': { 'date': '请选择日期', 'dateRange': '请选择日期范围' - } + }, + 'confirm_text' : '确定', }, 'en': { 'days': ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], @@ -15,7 +16,8 @@ export default { 'placeholder': { 'date': 'Select Date', 'dateRange': 'Select Date Range' - } + }, + 'confirm_text' : 'OK', }, 'fr': { 'days': ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'], @@ -24,7 +26,8 @@ export default { 'placeholder': { 'date': 'Sélectionnez une date', 'dateRange': 'Sélectionnez une période' - } + }, + 'confirm_text' : 'OK', }, 'es': { 'days': ['Dom', 'Lun', 'mar', 'Mie', 'Jue', 'Vie', 'Sab'], @@ -33,7 +36,8 @@ export default { 'placeholder': { 'date': 'Seleccionar fecha', 'dateRange': 'Seleccionar un rango de fechas' - } + }, + 'confirm_text' : 'OK', }, 'pt-br': { 'days': ['Dom', 'Seg', 'Ter', 'Qua', 'Quin', 'Sex', 'Sáb'], @@ -42,7 +46,8 @@ export default { 'placeholder': { 'date': 'Selecione uma data', 'dateRange': 'Selecione um período' - } + }, + 'confirm_text' : 'OK', }, 'ru': { 'days': ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'], @@ -51,7 +56,8 @@ export default { 'placeholder': { 'date': 'Выберите дату', 'dateRange': 'Выберите период' - } + }, + 'confirm_text' : 'OK', }, 'de': { 'days': ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'], @@ -60,7 +66,8 @@ export default { 'placeholder': { 'date': 'Datum auswählen', 'dateRange': 'Zeitraum auswählen' - } + }, + 'confirm_text' : 'OK', }, 'it': { 'days': ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'], @@ -69,7 +76,8 @@ export default { 'placeholder': { 'date': 'Seleziona una data', 'dateRange': 'Seleziona un intervallo date' - } + }, + 'confirm_text' : 'Determinare', }, 'cs': { 'days': ['Ned', 'Pon', 'Úte', 'Stř', 'Čtv', 'Pát', 'Sob'], @@ -78,6 +86,7 @@ export default { 'placeholder': { 'date': 'Vyberte datum', 'dateRange': 'Vyberte časové rozmezí' - } + }, + 'confirm_text' : 'Accede', } } From d860a737986b1266d054130d3d2d280c783e5661 Mon Sep 17 00:00:00 2001 From: Manash Sonowal Date: Thu, 16 Nov 2017 21:24:15 +0530 Subject: [PATCH 2/5] updated confirm text as prop --- datepicker/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/datepicker/index.vue b/datepicker/index.vue index 9969264..cc8e48f 100644 --- a/datepicker/index.vue +++ b/datepicker/index.vue @@ -41,7 +41,7 @@ :show="showPopup"> @@ -107,6 +107,10 @@ export default { inputClass: { type: String, default: 'input' + }, + confirm_text: { + type: String, + default: 'Ok' } }, data () { From 225982dc7db8e998fc6fc6decb257dd79f311582 Mon Sep 17 00:00:00 2001 From: Manash Sonowal Date: Thu, 16 Nov 2017 21:25:26 +0530 Subject: [PATCH 3/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e3f50d2..33f83d3 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ export default { | first-day-of-week | Number | 7 | set the first day of week (1-7) | | minute-step | Number | 0 | if > 0 don't show the second picker(0 - 60) | | input-class | String | 'input' | the input class name | +| confirm_text | String | 'Ok' | the default text to display on confirm button | ## shortcuts From 16cd25f2f84b850c265496cd815b155e8bb3aaaa Mon Sep 17 00:00:00 2001 From: Manash Sonowal Date: Fri, 17 Nov 2017 18:59:56 +0530 Subject: [PATCH 4/5] Update languages.js --- datepicker/languages.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/datepicker/languages.js b/datepicker/languages.js index b333f42..84e2df1 100644 --- a/datepicker/languages.js +++ b/datepicker/languages.js @@ -7,7 +7,6 @@ export default { 'date': '请选择日期', 'dateRange': '请选择日期范围' }, - 'confirm_text' : '确定', }, 'en': { 'days': ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], @@ -17,7 +16,6 @@ export default { 'date': 'Select Date', 'dateRange': 'Select Date Range' }, - 'confirm_text' : 'OK', }, 'fr': { 'days': ['Dim', 'Lun', 'Mar', 'Mer', 'Jeu', 'Ven', 'Sam'], @@ -27,7 +25,6 @@ export default { 'date': 'Sélectionnez une date', 'dateRange': 'Sélectionnez une période' }, - 'confirm_text' : 'OK', }, 'es': { 'days': ['Dom', 'Lun', 'mar', 'Mie', 'Jue', 'Vie', 'Sab'], @@ -37,7 +34,6 @@ export default { 'date': 'Seleccionar fecha', 'dateRange': 'Seleccionar un rango de fechas' }, - 'confirm_text' : 'OK', }, 'pt-br': { 'days': ['Dom', 'Seg', 'Ter', 'Qua', 'Quin', 'Sex', 'Sáb'], @@ -47,7 +43,6 @@ export default { 'date': 'Selecione uma data', 'dateRange': 'Selecione um período' }, - 'confirm_text' : 'OK', }, 'ru': { 'days': ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'], @@ -57,7 +52,6 @@ export default { 'date': 'Выберите дату', 'dateRange': 'Выберите период' }, - 'confirm_text' : 'OK', }, 'de': { 'days': ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'], @@ -67,7 +61,6 @@ export default { 'date': 'Datum auswählen', 'dateRange': 'Zeitraum auswählen' }, - 'confirm_text' : 'OK', }, 'it': { 'days': ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'], @@ -77,7 +70,6 @@ export default { 'date': 'Seleziona una data', 'dateRange': 'Seleziona un intervallo date' }, - 'confirm_text' : 'Determinare', }, 'cs': { 'days': ['Ned', 'Pon', 'Úte', 'Stř', 'Čtv', 'Pát', 'Sob'], @@ -87,6 +79,5 @@ export default { 'date': 'Vyberte datum', 'dateRange': 'Vyberte časové rozmezí' }, - 'confirm_text' : 'Accede', } } From 8fb4879adeb3e3f4e7677232fa25b411e6457b12 Mon Sep 17 00:00:00 2001 From: Manash Sonowal Date: Fri, 17 Nov 2017 19:00:50 +0530 Subject: [PATCH 5/5] Update index.vue --- datepicker/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datepicker/index.vue b/datepicker/index.vue index cc8e48f..33398e6 100644 --- a/datepicker/index.vue +++ b/datepicker/index.vue @@ -41,7 +41,7 @@ :show="showPopup">