From 78714069f0560ce29c1066657e3f51044813a214 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Thu, 18 Apr 2019 10:17:54 +0000 Subject: [PATCH 1/2] i18n: localize the date format placeholders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For instance, when using French, display the date input placeholder as "jj/mm/aaaa" (instead of "dd/mm/yyyy"). This doesn't change the way dates are actually parsed – only what is displayed to the user changes. --- locale/br.json | 3 ++- locale/ca.json | 3 ++- locale/de.json | 3 ++- locale/en.json | 3 ++- locale/es.json | 3 ++- locale/fr.json | 3 ++- locale/hu.json | 3 ++- locale/it.json | 3 ++- locale/nl.json | 3 ++- locale/oc.json | 3 ++- tpl/add_column.tpl | 2 +- tpl/create_date_poll_step_2.tpl | 6 +++--- tpl/create_poll_step_3.tpl | 2 +- 13 files changed, 25 insertions(+), 15 deletions(-) diff --git a/locale/br.json b/locale/br.json index 5d58d4a..f0983ad 100644 --- a/locale/br.json +++ b/locale/br.json @@ -100,7 +100,8 @@ "Start date": "Deiziad deraouiñ", "Y-m-d": "d/m/Y", "You can select at most 4 months": "Gallout a rit diuzañ 4 miz d'ar muiañ", - "yyyy-mm-dd": "dd/mm/yyyy" + "yyyy-mm-dd": "dd/mm/yyyy", + "yyyy-mm-dd-for-humans": "dd/vv/bbbb" }, "EditLink": { "Edit link for poll \"%s\"": "Ere embann ar sontadeg \"%s\"", diff --git a/locale/ca.json b/locale/ca.json index e0c91bb..cef9546 100644 --- a/locale/ca.json +++ b/locale/ca.json @@ -100,7 +100,8 @@ "Start date": "Data d'inici", "Y-m-d": "Y-m-d", "You can select at most 4 months": "Pots seleccionar com a màxim 4 mesos", - "yyyy-mm-dd": "yyyy-mm-dd" + "yyyy-mm-dd": "yyyy-mm-dd", + "yyyy-mm-dd-for-humans": "aaaa-mm-dd" }, "EditLink": { "Edit link for poll \"%s\"": "Edita l'enllaç de l'enquesta \"%s\"", diff --git a/locale/de.json b/locale/de.json index d0883ee..a2f2033 100644 --- a/locale/de.json +++ b/locale/de.json @@ -100,7 +100,8 @@ "Start date": "Startdatum", "Y-m-d": "d-m-Y", "You can select at most 4 months": "Es können maximal 4 Monate ausgewählt werden", - "yyyy-mm-dd": "dd-mm-yyyy" + "yyyy-mm-dd": "dd-mm-yyyy", + "yyyy-mm-dd-for-humans": "tt-mm-jjjj" }, "EditLink": { "Edit link for poll \"%s\"": "Link für die Abstimmung \"%s\" bearbeiten", diff --git a/locale/en.json b/locale/en.json index fbfcb24..cb49c17 100644 --- a/locale/en.json +++ b/locale/en.json @@ -100,7 +100,8 @@ "Start date": "Start date", "Y-m-d": "Y-m-d", "You can select at most 4 months": "You can select at most 4 months", - "yyyy-mm-dd": "yyyy-mm-dd" + "yyyy-mm-dd": "yyyy-mm-dd", + "yyyy-mm-dd-for-humans": "yyyy-mm-dd" }, "EditLink": { "Edit link for poll \"%s\"": "Edit link for poll \"%s\"", diff --git a/locale/es.json b/locale/es.json index 26d3fcc..9da0cc8 100644 --- a/locale/es.json +++ b/locale/es.json @@ -100,7 +100,8 @@ "Start date": "Fecha de Inicio", "Y-m-d": "d/m/Y", "You can select at most 4 months": "Puede seleccionar como máximo 4 meses", - "yyyy-mm-dd": "dd/mm/yyyy" + "yyyy-mm-dd": "dd/mm/yyyy", + "yyyy-mm-dd-for-humans": "dd/mm/aaaa" }, "EditLink": { "Edit link for poll \"%s\"": "Enlace para edición de encuesta \"%s\"", diff --git a/locale/fr.json b/locale/fr.json index 6e410ac..99a9de9 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -100,7 +100,8 @@ "Start date": "Date de début", "Y-m-d": "d/m/Y", "You can select at most 4 months": "Vous pouvez sélectionner au maximum 4 mois", - "yyyy-mm-dd": "dd/mm/yyyy" + "yyyy-mm-dd": "dd/mm/yyyy", + "yyyy-mm-dd-for-humans": "jj/mm/aaaa" }, "EditLink": { "Edit link for poll \"%s\"": "Lien d'édition du sondage \"%s\"", diff --git a/locale/hu.json b/locale/hu.json index 487a199..fb45ac9 100644 --- a/locale/hu.json +++ b/locale/hu.json @@ -100,7 +100,8 @@ "Start date": "Kezdő dátum", "Y-m-d": "Y.m.d.", "You can select at most 4 months": "Legfeljebb 4 hónapot válaszhatsz", - "yyyy-mm-dd": "yyyy.mm.dd." + "yyyy-mm-dd": "yyyy.mm.dd.", + "yyyy-mm-dd-for-humans": "éééé.hh.nn." }, "EditLink": { "Edit link for poll \"%s\"": "A(z) „%s” szavazás hivatkozásának szerkesztése", diff --git a/locale/it.json b/locale/it.json index 1e6c869..082d4e6 100644 --- a/locale/it.json +++ b/locale/it.json @@ -100,7 +100,8 @@ "Start date": "Data iniziale", "Y-m-d": "d/m/Y", "You can select at most 4 months": "Potete selezionare al massimo 4 mesi", - "yyyy-mm-dd": "dd/mm/yyyy" + "yyyy-mm-dd": "dd/mm/yyyy", + "yyyy-mm-dd-for-humans": "gg/mm/aaaa" }, "EditLink": { "Edit link for poll \"%s\"": "Modifica il link del sondaggio \"%s\"", diff --git a/locale/nl.json b/locale/nl.json index 1e966fe..154671f 100644 --- a/locale/nl.json +++ b/locale/nl.json @@ -100,7 +100,8 @@ "Start date": "Begindatum", "Y-m-d": "d/m/Y", "You can select at most 4 months": "Je kan maximaal 4 maanden selecteren", - "yyyy-mm-dd": "dd/mm/yyyy" + "yyyy-mm-dd": "dd/mm/yyyy", + "yyyy-mm-dd-for-humans": "dd/mm/jjjj" }, "EditLink": { "Edit link for poll \"%s\"": "Bewerkingslink voor de poll \"%s\"", diff --git a/locale/oc.json b/locale/oc.json index 818570b..0a76aae 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -100,7 +100,8 @@ "Start date": "Data de debuta", "Y-m-d": "d/m/Y", "You can select at most 4 months": "Podètz pas causir mai de 4 meses", - "yyyy-mm-dd": "dd/mm/yyyy" + "yyyy-mm-dd": "dd/mm/yyyy", + "yyyy-mm-dd-for-humans": "jj/mm/aaaa" }, "EditLink": { "Edit link for poll \"%s\"": "Ligam de modificacion del sondatge \"%s\"", diff --git a/tpl/add_column.tpl b/tpl/add_column.tpl index cd641f5..00280b4 100644 --- a/tpl/add_column.tpl +++ b/tpl/add_column.tpl @@ -25,7 +25,7 @@
- +
({__('Date', 'yyyy-mm-dd')})
diff --git a/tpl/create_date_poll_step_2.tpl b/tpl/create_date_poll_step_2.tpl index b980f09..e53b4b2 100644 --- a/tpl/create_date_poll_step_2.tpl +++ b/tpl/create_date_poll_step_2.tpl @@ -53,7 +53,7 @@ + size="10" maxlength="10" placeholder="{__('Date', 'yyyy-mm-dd-for-humans')}" autocomplete="off"/>
@@ -149,7 +149,7 @@ + placeholder="{__('Date', 'yyyy-mm-dd-for-humans')}"/>
@@ -158,7 +158,7 @@ + placeholder="{__('Date', 'yyyy-mm-dd-for-humans')}"/>
diff --git a/tpl/create_poll_step_3.tpl b/tpl/create_poll_step_3.tpl index fdb0518..3e650a6 100644 --- a/tpl/create_poll_step_3.tpl +++ b/tpl/create_poll_step_3.tpl @@ -26,7 +26,7 @@
- +
{__('Date', 'yyyy-mm-dd')} From fe5d28e394fd05ed72779a85f52606d9f95e37db Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Thu, 18 Apr 2019 10:18:02 +0000 Subject: [PATCH 2/2] i18n: use full nouns in date placeholders --- locale/br.json | 2 +- locale/ca.json | 2 +- locale/de.json | 2 +- locale/en.json | 2 +- locale/es.json | 2 +- locale/fr.json | 2 +- locale/hu.json | 2 +- locale/it.json | 2 +- locale/nl.json | 2 +- locale/oc.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/locale/br.json b/locale/br.json index f0983ad..9fb17d2 100644 --- a/locale/br.json +++ b/locale/br.json @@ -101,7 +101,7 @@ "Y-m-d": "d/m/Y", "You can select at most 4 months": "Gallout a rit diuzañ 4 miz d'ar muiañ", "yyyy-mm-dd": "dd/mm/yyyy", - "yyyy-mm-dd-for-humans": "dd/vv/bbbb" + "yyyy-mm-dd-for-humans": "devezh / miz / bloaz" }, "EditLink": { "Edit link for poll \"%s\"": "Ere embann ar sontadeg \"%s\"", diff --git a/locale/ca.json b/locale/ca.json index cef9546..0b3709a 100644 --- a/locale/ca.json +++ b/locale/ca.json @@ -101,7 +101,7 @@ "Y-m-d": "Y-m-d", "You can select at most 4 months": "Pots seleccionar com a màxim 4 mesos", "yyyy-mm-dd": "yyyy-mm-dd", - "yyyy-mm-dd-for-humans": "aaaa-mm-dd" + "yyyy-mm-dd-for-humans": "any-mes-dia" }, "EditLink": { "Edit link for poll \"%s\"": "Edita l'enllaç de l'enquesta \"%s\"", diff --git a/locale/de.json b/locale/de.json index a2f2033..e2f0d01 100644 --- a/locale/de.json +++ b/locale/de.json @@ -101,7 +101,7 @@ "Y-m-d": "d-m-Y", "You can select at most 4 months": "Es können maximal 4 Monate ausgewählt werden", "yyyy-mm-dd": "dd-mm-yyyy", - "yyyy-mm-dd-for-humans": "tt-mm-jjjj" + "yyyy-mm-dd-for-humans": "Tag-Monat-Jahr" }, "EditLink": { "Edit link for poll \"%s\"": "Link für die Abstimmung \"%s\" bearbeiten", diff --git a/locale/en.json b/locale/en.json index cb49c17..4c21633 100644 --- a/locale/en.json +++ b/locale/en.json @@ -101,7 +101,7 @@ "Y-m-d": "Y-m-d", "You can select at most 4 months": "You can select at most 4 months", "yyyy-mm-dd": "yyyy-mm-dd", - "yyyy-mm-dd-for-humans": "yyyy-mm-dd" + "yyyy-mm-dd-for-humans": "year-month-day" }, "EditLink": { "Edit link for poll \"%s\"": "Edit link for poll \"%s\"", diff --git a/locale/es.json b/locale/es.json index 9da0cc8..6f68cea 100644 --- a/locale/es.json +++ b/locale/es.json @@ -101,7 +101,7 @@ "Y-m-d": "d/m/Y", "You can select at most 4 months": "Puede seleccionar como máximo 4 meses", "yyyy-mm-dd": "dd/mm/yyyy", - "yyyy-mm-dd-for-humans": "dd/mm/aaaa" + "yyyy-mm-dd-for-humans": "día / mes / año" }, "EditLink": { "Edit link for poll \"%s\"": "Enlace para edición de encuesta \"%s\"", diff --git a/locale/fr.json b/locale/fr.json index 99a9de9..5176b6a 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -101,7 +101,7 @@ "Y-m-d": "d/m/Y", "You can select at most 4 months": "Vous pouvez sélectionner au maximum 4 mois", "yyyy-mm-dd": "dd/mm/yyyy", - "yyyy-mm-dd-for-humans": "jj/mm/aaaa" + "yyyy-mm-dd-for-humans": "jour / mois / année" }, "EditLink": { "Edit link for poll \"%s\"": "Lien d'édition du sondage \"%s\"", diff --git a/locale/hu.json b/locale/hu.json index fb45ac9..6f35f62 100644 --- a/locale/hu.json +++ b/locale/hu.json @@ -101,7 +101,7 @@ "Y-m-d": "Y.m.d.", "You can select at most 4 months": "Legfeljebb 4 hónapot válaszhatsz", "yyyy-mm-dd": "yyyy.mm.dd.", - "yyyy-mm-dd-for-humans": "éééé.hh.nn." + "yyyy-mm-dd-for-humans": "év.hónap.nap." }, "EditLink": { "Edit link for poll \"%s\"": "A(z) „%s” szavazás hivatkozásának szerkesztése", diff --git a/locale/it.json b/locale/it.json index 082d4e6..ede3e5b 100644 --- a/locale/it.json +++ b/locale/it.json @@ -101,7 +101,7 @@ "Y-m-d": "d/m/Y", "You can select at most 4 months": "Potete selezionare al massimo 4 mesi", "yyyy-mm-dd": "dd/mm/yyyy", - "yyyy-mm-dd-for-humans": "gg/mm/aaaa" + "yyyy-mm-dd-for-humans": "giorno / mese / anno" }, "EditLink": { "Edit link for poll \"%s\"": "Modifica il link del sondaggio \"%s\"", diff --git a/locale/nl.json b/locale/nl.json index 154671f..21278f2 100644 --- a/locale/nl.json +++ b/locale/nl.json @@ -101,7 +101,7 @@ "Y-m-d": "d/m/Y", "You can select at most 4 months": "Je kan maximaal 4 maanden selecteren", "yyyy-mm-dd": "dd/mm/yyyy", - "yyyy-mm-dd-for-humans": "dd/mm/jjjj" + "yyyy-mm-dd-for-humans": "dag / maand / jaar" }, "EditLink": { "Edit link for poll \"%s\"": "Bewerkingslink voor de poll \"%s\"", diff --git a/locale/oc.json b/locale/oc.json index 0a76aae..d3c7b16 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -101,7 +101,7 @@ "Y-m-d": "d/m/Y", "You can select at most 4 months": "Podètz pas causir mai de 4 meses", "yyyy-mm-dd": "dd/mm/yyyy", - "yyyy-mm-dd-for-humans": "jj/mm/aaaa" + "yyyy-mm-dd-for-humans": "jorn / mes / annada" }, "EditLink": { "Edit link for poll \"%s\"": "Ligam de modificacion del sondatge \"%s\"",