From 517f67a3a9d01df13dd492b0bf2bbde994274849 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 6 Mar 2016 21:51:46 +0000 Subject: [PATCH] remove double entry in daterangepicker translations, open calendar always (#116) --- application/language/de-CH/datepicker_lang.php | 1 - application/language/en/datepicker_lang.php | 1 - application/language/es/datepicker_lang.php | 1 - application/language/fr/datepicker_lang.php | 1 - application/language/id/datepicker_lang.php | 3 +-- application/language/nl-BE/datepicker_lang.php | 1 - application/language/ru/datepicker_lang.php | 3 +-- application/language/th/datepicker_lang.php | 3 +-- application/language/tr/datepicker_lang.php | 3 +-- application/language/zh/datepicker_lang.php | 3 +-- application/views/partial/daterangepicker.php | 1 + translations/datepicker_lang.csv | 3 +-- 12 files changed, 7 insertions(+), 17 deletions(-) diff --git a/application/language/de-CH/datepicker_lang.php b/application/language/de-CH/datepicker_lang.php index 045b2d114..734db28d5 100644 --- a/application/language/de-CH/datepicker_lang.php +++ b/application/language/de-CH/datepicker_lang.php @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "Dieser Monat letzten Jahres"; $lang["datepicker_this_month_to_today"] = "Dieser Monat bis heute"; $lang["datepicker_this_month_to_today_last_year"] = "Dieser Monat bis Heute letzten Jahres"; $lang["datepicker_this_year"] = "Dieses Jahr"; -$lang["datepicker_today"] = "Heute"; $lang["datepicker_today_last_year"] = "Heute letzten Jahres"; $lang["datepicker_yesterday"] = "Gestern"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/en/datepicker_lang.php b/application/language/en/datepicker_lang.php index 14bc8a36a..7c325e6cd 100644 --- a/application/language/en/datepicker_lang.php +++ b/application/language/en/datepicker_lang.php @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "This Year"; -$lang["datepicker_today"] = "Today"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "Yesterday"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/es/datepicker_lang.php b/application/language/es/datepicker_lang.php index 0d84a8a44..cb4264286 100644 --- a/application/language/es/datepicker_lang.php +++ b/application/language/es/datepicker_lang.php @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "Este Año"; -$lang["datepicker_today"] = "Hoy"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "Ayer"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/fr/datepicker_lang.php b/application/language/fr/datepicker_lang.php index 53361f0b8..55e016daf 100644 --- a/application/language/fr/datepicker_lang.php +++ b/application/language/fr/datepicker_lang.php @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "Cette Année"; -$lang["datepicker_today"] = "Aujourd\'hui"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "Hier"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/id/datepicker_lang.php b/application/language/id/datepicker_lang.php index 9a9d4978f..e44d10274 100644 --- a/application/language/id/datepicker_lang.php +++ b/application/language/id/datepicker_lang.php @@ -45,7 +45,7 @@ $lang["datepicker_monthsshort_september"] = ""; $lang["datepicker_monthsshort_october"] = ""; $lang["datepicker_monthsshort_november"] = ""; $lang["datepicker_monthsshort_december"] = ""; -$lang["datepicker_today"] = ""; +$lang["datepicker_today"] = "Hari ini"; $lang["datepicker_weekstart"] = ""; $lang["datepicker_all_time"] = "Semua Waktu"; $lang["datepicker_last_7"] = "7 Hari Terakhir"; @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "Tahun ini"; -$lang["datepicker_today"] = "Hari ini"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "Kemarin"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/nl-BE/datepicker_lang.php b/application/language/nl-BE/datepicker_lang.php index af61fb6d5..44a62626e 100644 --- a/application/language/nl-BE/datepicker_lang.php +++ b/application/language/nl-BE/datepicker_lang.php @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "Dit Jaar"; -$lang["datepicker_today"] = "Vandaag"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "Gisteren"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/ru/datepicker_lang.php b/application/language/ru/datepicker_lang.php index 29cc97f50..6ee3544a3 100644 --- a/application/language/ru/datepicker_lang.php +++ b/application/language/ru/datepicker_lang.php @@ -45,7 +45,7 @@ $lang["datepicker_monthsshort_september"] = ""; $lang["datepicker_monthsshort_october"] = ""; $lang["datepicker_monthsshort_november"] = ""; $lang["datepicker_monthsshort_december"] = ""; -$lang["datepicker_today"] = ""; +$lang["datepicker_today"] = "сегодня"; $lang["datepicker_weekstart"] = ""; $lang["datepicker_all_time"] = "за все время"; $lang["datepicker_last_7"] = "Последние 7 дней"; @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "В этом году"; -$lang["datepicker_today"] = "сегодня"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "вчера"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/th/datepicker_lang.php b/application/language/th/datepicker_lang.php index ced85af25..36e9638c0 100644 --- a/application/language/th/datepicker_lang.php +++ b/application/language/th/datepicker_lang.php @@ -45,7 +45,7 @@ $lang["datepicker_monthsshort_september"] = ""; $lang["datepicker_monthsshort_october"] = ""; $lang["datepicker_monthsshort_november"] = ""; $lang["datepicker_monthsshort_december"] = ""; -$lang["datepicker_today"] = ""; +$lang["datepicker_today"] = "วันนี้"; $lang["datepicker_weekstart"] = ""; $lang["datepicker_all_time"] = "เวลาทั้งหมด"; $lang["datepicker_last_7"] = "7 วันสุดท้าย"; @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "ปีนี้"; -$lang["datepicker_today"] = "วันนี้"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "เมื่อวานนี้"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/tr/datepicker_lang.php b/application/language/tr/datepicker_lang.php index c06802429..efe405c0a 100644 --- a/application/language/tr/datepicker_lang.php +++ b/application/language/tr/datepicker_lang.php @@ -45,7 +45,7 @@ $lang["datepicker_monthsshort_september"] = ""; $lang["datepicker_monthsshort_october"] = ""; $lang["datepicker_monthsshort_november"] = ""; $lang["datepicker_monthsshort_december"] = ""; -$lang["datepicker_today"] = ""; +$lang["datepicker_today"] = "Bugün"; $lang["datepicker_weekstart"] = ""; $lang["datepicker_all_time"] = "Tüm Zamanlar"; $lang["datepicker_last_7"] = "Son 7 Gün"; @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "Bu Yıl"; -$lang["datepicker_today"] = "Bugün"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "Dün"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/language/zh/datepicker_lang.php b/application/language/zh/datepicker_lang.php index b7c61750a..a1adcc21d 100644 --- a/application/language/zh/datepicker_lang.php +++ b/application/language/zh/datepicker_lang.php @@ -45,7 +45,7 @@ $lang["datepicker_monthsshort_september"] = ""; $lang["datepicker_monthsshort_october"] = ""; $lang["datepicker_monthsshort_november"] = ""; $lang["datepicker_monthsshort_december"] = ""; -$lang["datepicker_today"] = ""; +$lang["datepicker_today"] = "今天"; $lang["datepicker_weekstart"] = ""; $lang["datepicker_all_time"] = "全部"; $lang["datepicker_last_7"] = "過去七天"; @@ -57,7 +57,6 @@ $lang["datepicker_this_month_last_year"] = "This Month Last Year"; $lang["datepicker_this_month_to_today"] = "This Month To Today"; $lang["datepicker_this_month_to_today_last_year"] = "This Month To Today Last Year"; $lang["datepicker_this_year"] = "今年"; -$lang["datepicker_today"] = "今天"; $lang["datepicker_today_last_year"] = "Today Last Year"; $lang["datepicker_yesterday"] = "昨天"; $lang["datepicker_apply"] = "Apply"; diff --git a/application/views/partial/daterangepicker.php b/application/views/partial/daterangepicker.php index 3ccfa815e..ece4c7ba5 100644 --- a/application/views/partial/daterangepicker.php +++ b/application/views/partial/daterangepicker.php @@ -86,6 +86,7 @@ $('#daterangepicker').daterangepicker({ ], "firstDay": lang->line("datepicker_weekstart"); ?> }, + "alwaysShowCalendars": true, "startDate": "config->item('dateformat'), time());?>", "endDate": "config->item('dateformat'), time());?>", "minDate": "config->item('dateformat'), mktime(0,0,0,01,01,2010));?>", diff --git a/translations/datepicker_lang.csv b/translations/datepicker_lang.csv index 0966b5db2..f78a29809 100644 --- a/translations/datepicker_lang.csv +++ b/translations/datepicker_lang.csv @@ -44,7 +44,7 @@ datepicker_monthsshort_september,Sep,Sep,Sep,Sep,Sep,,,,, datepicker_monthsshort_october,Okt,Okt,Oct,Oct,Oct,,,,, datepicker_monthsshort_november,Nov,Nov,Nov,Nov,Nov,,,,, datepicker_monthsshort_december,Dez,Dec,Dic,Dec,Dec,,,,, -datepicker_today,Heute,Vandaag,Hoy,Today,Aujourd'hui,,,,, +datepicker_today,Heute,Vandaag,Hoy,Today,Aujourd'hui,今天,сегодня,วันนี้,Bugün,Hari ini datepicker_weekstart,1,0,0,0,1,,,,, datepicker_all_time,Von Beginn weg,Alle,Todos,All Time,Depuis le début,全部,за все время,เวลาทั้งหมด,Tüm Zamanlar,Semua Waktu datepicker_last_7,Letzte 7 Tage,Vorige 7 Dagen,Últimos 7 Días,Last 7 Days,Ces 7 derniers jours,過去七天,Последние 7 дней,7 วันสุดท้าย,Son 7 Gün,7 Hari Terakhir @@ -56,7 +56,6 @@ datepicker_this_month_last_year,Dieser Monat letzten Jahres,This Month Last Year datepicker_this_month_to_today,Dieser Monat bis heute,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today,This Month To Today datepicker_this_month_to_today_last_year,Dieser Monat bis Heute letzten Jahres,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year,This Month To Today Last Year datepicker_this_year,Dieses Jahr,Dit Jaar,Este Año,This Year,Cette Année,今年,В этом году,ปีนี้,Bu Yıl,Tahun ini -datepicker_today,Heute,Vandaag,Hoy,Today,Aujourd\'hui,今天,сегодня,วันนี้,Bugün,Hari ini datepicker_today_last_year,Heute letzten Jahres,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year,Today Last Year datepicker_yesterday,Gestern,Gisteren,Ayer,Yesterday,Hier,昨天,вчера,เมื่อวานนี้,Dün,Kemarin datepicker_apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply,Apply