From dd8e817a9e25026e9805dcdb0ed136aca80f7bd7 Mon Sep 17 00:00:00 2001 From: Jan Breig Date: Thu, 13 Mar 2025 12:01:33 +0100 Subject: [PATCH] Fix time format issues Fix #604, #609, #610 --- app/inc/i18n.php | 19 ++++++------------- locale/ar.json | 12 ++++++------ locale/br.json | 12 ++++++------ locale/ca.json | 12 ++++++------ locale/de.json | 12 ++++++------ locale/en.json | 12 ++++++------ locale/eo.json | 12 ++++++------ locale/es.json | 12 ++++++------ locale/fr.json | 12 ++++++------ locale/fr_FR.json | 12 ++++++------ locale/gl.json | 12 ++++++------ locale/it.json | 12 ++++++------ locale/nl.json | 12 ++++++------ locale/oc.json | 12 ++++++------ 14 files changed, 84 insertions(+), 91 deletions(-) diff --git a/app/inc/i18n.php b/app/inc/i18n.php index d481551..37a8ec1 100644 --- a/app/inc/i18n.php +++ b/app/inc/i18n.php @@ -34,19 +34,12 @@ $i18n->get('', 'Something, just to load the dictionary'); $locale = str_replace('_', '-', $i18n->getLoadedLang()); /* Date Format */ -//$date_format['txt_full'] = __('Date', 'FULL'); //summary in create_date_poll.php and removal date in choix_(date|autre).php -//$date_format['txt_short'] = __('Date', 'SHORT'); // radio title -//$date_format['txt_day'] = __('Date', 'DAY'); -//$date_format['txt_date'] = __('Date', 'DATE'); -//$date_format['txt_month_year'] = __('Date', 'MONTH_YEAR'); -//$date_format['txt_datetime_short'] = __('Date', 'DATETIME'); - -$date_format['txt_full'] = 'eeee d MMMM y'; //summary in create_date_poll.php and removal date in choix_(date|autre).php -$date_format['txt_short'] = 'E d MMMM y'; // radio title -$date_format['txt_day'] = 'E d'; -$date_format['txt_date'] = ''; // Defaults to IntlDateFormatter::SHORT -$date_format['txt_month_year'] = 'MMMM y'; -$date_format['txt_datetime_short'] = 'dd-MM-y HH:mm'; +$date_format['txt_full'] = __('Date', 'FULL'); //summary in create_date_poll.php and removal date in choix_(date|autre).php +$date_format['txt_short'] = __('Date', 'SHORT'); // radio title +$date_format['txt_day'] = __('Date', 'DAY'); +$date_format['txt_date'] = __('Date', 'DATE'); +$date_format['txt_month_year'] = __('Date', 'MONTH_YEAR'); +$date_format['txt_datetime_short'] = __('Date', 'DATETIME'); function formatDate(string $format, $date) { global $locale; diff --git a/locale/ar.json b/locale/ar.json index 9e2f288..523813c 100644 --- a/locale/ar.json +++ b/locale/ar.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Add range dates", - "DATE": "%Y-%m-%d", - "DATETIME": "%m/%d/%Y %H:%M", - "DAY": "%a %e", + "DATE": "y-MM-dd", + "DATETIME": "MM/dd/y HH:mm", + "DAY": "E d", "End date": "End date", - "FULL": "%A, %B %e, %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee, MMMM d, y", + "MONTH_YEAR": "MMMM y", "Max dates count": "You can select at most 4 months", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Start date", "datepicker": "yyyy-mm-dd", "datetime_parseformat": "Y-m-d", diff --git a/locale/br.json b/locale/br.json index fe71db9..bebc48a 100644 --- a/locale/br.json +++ b/locale/br.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Ouzhpennañ", - "DATE": "%d/%m/%Y", - "DATETIME": "%d-%m-%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd-MM-y HH:mm", + "DAY": "E d", "End date": "Deiziad dibenn", - "FULL": "%A %e a viz %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee d 'a viz' MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Gallout a rit diuzañ 4 miz d'ar muiañ", - "SHORT": "%A %e a viz %B %Y", + "SHORT": "eeee d 'a viz' MMMM y", "Start date": "Deiziad deraouiñ", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y", diff --git a/locale/ca.json b/locale/ca.json index 4845266..963f34f 100644 --- a/locale/ca.json +++ b/locale/ca.json @@ -367,14 +367,14 @@ "datetime_parseformat": "d/m/Y", "datepicker": "dd/mm/yyyy", "Start date": "Data d'inici", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Max dates count": "Podeu seleccionar com a màxim 4 mesos", - "MONTH_YEAR": "%B %Y", - "FULL": "%A, %B %e, %Y", + "MONTH_YEAR": "MMMM y", + "FULL": "eeee, MMMM d, y", "End date": "Data final", - "DAY": "%a %e", - "DATETIME": "%m/%d/%Y %H:%M", - "DATE": "%Y-%m-%d", + "DAY": "E d", + "DATETIME": "MM/dd/y HH:mm", + "DATE": "y-MM-dd", "Add range dates": "Afegeix un interval de dates" }, "Comments": { diff --git a/locale/de.json b/locale/de.json index 7987f8f..88c7ef7 100644 --- a/locale/de.json +++ b/locale/de.json @@ -89,14 +89,14 @@ }, "Date": { "Add range dates": "Datumsbereich hinzufügen", - "DATE": "%Y-%m-%d", - "DATETIME": "%Y-%m-%d %H:%M", - "DAY": "%a %e", + "DATE": "y-MM-dd", + "DATETIME": "y-MM-dd HH:mm", + "DAY": "E d", "End date": "Enddatum", - "FULL": "%A, den %e. %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee, 'den' d. MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Es können maximal 4 Monate ausgewählt werden", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Startdatum", "datepicker": "yyyy-mm-dd", "datetime_parseformat": "Y-m-d", diff --git a/locale/en.json b/locale/en.json index 20fbeb7..d642467 100644 --- a/locale/en.json +++ b/locale/en.json @@ -90,14 +90,14 @@ }, "Date": { "Add range dates": "Add range dates", - "DATE": "%Y-%m-%d", - "DATETIME": "%m/%d/%Y %H:%M", - "DAY": "%a %e", + "DATE": "y-MM-dd", + "DATETIME": "MM/dd/y HH:mm", + "DAY": "E d", "End date": "End date", - "FULL": "%A, %B %e, %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee, MMMM d, y", + "MONTH_YEAR": "MMMM y", "Max dates count": "You can select at most 4 months", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Start date", "datepicker": "yyyy-mm-dd", "datetime_parseformat": "Y-m-d", diff --git a/locale/eo.json b/locale/eo.json index d3ec8d9..10d77ed 100644 --- a/locale/eo.json +++ b/locale/eo.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Add range dates", - "DATE": "%Y-%m-%d", - "DATETIME": "%m/%d/%Y %H:%M", - "DAY": "%a %e", + "DATE": "y-MM-dd", + "DATETIME": "MM/dd/y HH:mm", + "DAY": "E d", "End date": "End date", - "FULL": "%A, %B %e, %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee, MMMM d, y", + "MONTH_YEAR": "MMMM y", "Max dates count": "You can select at most 4 months", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Start date", "datepicker": "yyyy-mm-dd", "datetime_parseformat": "Y-m-d", diff --git a/locale/es.json b/locale/es.json index af242c3..1ebfcde 100644 --- a/locale/es.json +++ b/locale/es.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Agregar rango de fechas", - "DATE": "%d/%m/%Y", - "DATETIME": "%d/%m/%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd/MM/y HH:mm", + "DAY": "E d", "End date": "Fecha de Finalización", - "FULL": "%A, %e de %B de %Y", - "MONTH_YEAR": "%B de %Y", + "FULL": "eeee, d 'de' MMMM de y", + "MONTH_YEAR": "MMMM 'de' y", "Max dates count": "Pude seleccionar como máximo 4 meses", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Fecha de Inicio", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y", diff --git a/locale/fr.json b/locale/fr.json index 06ebd01..859ebf4 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Ajout d'un intervalle de dates", - "DATE": "%d/%m/%Y", - "DATETIME": "%d-%m-%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd-MM-y HH:mm", + "DAY": "E d", "End date": "Date de fin", - "FULL": "%A %e %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee d MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Vous pouvez sélectionner au maximum 4 mois", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Date de début", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y", diff --git a/locale/fr_FR.json b/locale/fr_FR.json index 44d84a6..12a56ab 100644 --- a/locale/fr_FR.json +++ b/locale/fr_FR.json @@ -90,14 +90,14 @@ }, "Date": { "Add range dates": "Ajout d'un intervalle de dates", - "DATE": "%d/%m/%Y", - "DATETIME": "%d-%m-%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd-MM-y HH:mm", + "DAY": "E d", "End date": "Date de fin", - "FULL": "%A %e %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee d MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Vous pouvez sélectionner au maximum 4 mois", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Date de début", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y", diff --git a/locale/gl.json b/locale/gl.json index 6a5cf39..980a6e5 100644 --- a/locale/gl.json +++ b/locale/gl.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Add range dates", - "DATE": "%Y-%m-%d", - "DATETIME": "%m/%d/%Y %H:%M", - "DAY": "%a %e", + "DATE": "y-MM-dd", + "DATETIME": "MM/dd/y HH:mm", + "DAY": "E d", "End date": "End date", - "FULL": "%A, %B %e, %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee, MMMM d, y", + "MONTH_YEAR": "MMMM y", "Max dates count": "You can select at most 4 months", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Start date", "datepicker": "yyyy-mm-dd", "datetime_parseformat": "Y-m-d", diff --git a/locale/it.json b/locale/it.json index 2b1b825..10d0dee 100644 --- a/locale/it.json +++ b/locale/it.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Aggiungere un intervallo tra 2 date", - "DATE": "%d/%m/%Y", - "DATETIME": "%d/%m/%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd/MM/y HH:mm", + "DAY": "E d", "End date": "Data finale", - "FULL": "%A %e %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee d MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Potete selezionare al massimo 4 mesi", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Data iniziale", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y", diff --git a/locale/nl.json b/locale/nl.json index 34808a3..55fe972 100644 --- a/locale/nl.json +++ b/locale/nl.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Voeg een datumbereik toe", - "DATE": "%d/%m/%Y", - "DATETIME": "%d-%m-%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd-MM-y HH:mm", + "DAY": "E d", "End date": "Einddatum", - "FULL": "%A %e %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee d MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Je kan maximaal 4 maanden selecteren", - "SHORT": "%a %e %b %Y", + "SHORT": "E d MMM y", "Start date": "Begindatum", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y", diff --git a/locale/oc.json b/locale/oc.json index f2580b9..0a49bbe 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -88,14 +88,14 @@ }, "Date": { "Add range dates": "Apondre un interval de datas", - "DATE": "%d/%m/%Y", - "DATETIME": "%d/%m/%Y %H:%M", - "DAY": "%a %e", + "DATE": "dd/MM/y", + "DATETIME": "dd/MM/y HH:mm", + "DAY": "E d", "End date": "Data de fin", - "FULL": "%A %e %B %Y", - "MONTH_YEAR": "%B %Y", + "FULL": "eeee d MMMM y", + "MONTH_YEAR": "MMMM y", "Max dates count": "Podètz pas causir mai de 4 meses", - "SHORT": "%A %e %B %Y", + "SHORT": "eeee d MMMM y", "Start date": "Data de debuta", "datepicker": "dd/mm/yyyy", "datetime_parseformat": "d/m/Y",