Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-01-23 10:15:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug/fix-time-format-issues' into 'v1.1.x'

Browse source 
Fix time format issues

Closes #604, #609, and #610

See merge request framasoft/framadate/framadate!519
This commit is contained in:
Jan Breig 2025-11-28 04:25:44 +00:00
commit c7149bbcee
14 changed files with 84 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/inc/i18n.php
View file

@ -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;

12
locale/ar.json
View file

@ -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",

12
locale/br.json
View file

@ -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",

12
locale/ca.json
View file

@ -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": {

12
locale/de.json
View file

@ -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",

12
locale/en.json
View file

@ -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",

12
locale/eo.json
View file

@ -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",

12
locale/es.json
View file

@ -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",

12
locale/fr.json
View file

@ -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",

12
locale/fr_FR.json
View file

@ -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",

12
locale/gl.json
View file

@ -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",

12
locale/it.json
View file

@ -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",

12
locale/nl.json
View file

@ -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",

12
locale/oc.json
View file

@ -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",