From 65a5c94c2f1c97e5a371b6422604c19ee12221dc Mon Sep 17 00:00:00 2001 From: Tchama Date: Thu, 10 Sep 2020 16:00:32 +0200 Subject: [PATCH] twig filter format_date need only one argument --- Resources/views/AccompanyingPeriod/form.html.twig | 2 +- Resources/views/AccompanyingPeriod/list.html.twig | 6 +++--- Resources/views/Address/list.html.twig | 2 +- Resources/views/Person/create_review.html.twig | 6 +++--- Resources/views/Person/list.html.twig | 2 +- Resources/views/Person/list_by_phonenumber.html.twig | 2 +- Resources/views/Person/view.html.twig | 2 +- Resources/views/Timeline/closing_period.html.twig | 2 +- Resources/views/Timeline/opening_period.html.twig | 2 +- Resources/views/layout.html.twig | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/views/AccompanyingPeriod/form.html.twig b/Resources/views/AccompanyingPeriod/form.html.twig index 4a1ee689b..45b43a2f1 100644 --- a/Resources/views/AccompanyingPeriod/form.html.twig +++ b/Resources/views/AccompanyingPeriod/form.html.twig @@ -26,7 +26,7 @@

{{ 'Last opening since %last_opening%'|trans( - { '%last_opening%' : accompanying_period.openingDate|format_date('long', 'none') }) }} + { '%last_opening%' : accompanying_period.openingDate|format_date('long') }) }}

{% if form.openingDate is defined %} diff --git a/Resources/views/AccompanyingPeriod/list.html.twig b/Resources/views/AccompanyingPeriod/list.html.twig index 628870ab0..4d82813d0 100644 --- a/Resources/views/AccompanyingPeriod/list.html.twig +++ b/Resources/views/AccompanyingPeriod/list.html.twig @@ -22,11 +22,11 @@ {% if accompanying_period.closingDate == null %} - {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long', 'none') } ) }} + {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }} {% else %} {{ 'accompanying_period.dates_from_%opening_date%_to_%closing_date%'|trans({ - '%opening_date%': accompanying_period.openingDate|format_date('long', 'none'), - '%closing_date%': accompanying_period.closingDate|format_date('long', 'none')} + '%opening_date%': accompanying_period.openingDate|format_date('long'), + '%closing_date%': accompanying_period.closingDate|format_date('long')} ) }} {% if accompanying_period.isOpen == false %} diff --git a/Resources/views/Address/list.html.twig b/Resources/views/Address/list.html.twig index 4af752e6b..9e91e486c 100644 --- a/Resources/views/Address/list.html.twig +++ b/Resources/views/Address/list.html.twig @@ -47,7 +47,7 @@ {% else %} {% for address in person.addresses %} - {{ 'Since %date%'|trans( { '%date%' : address.validFrom|format_date('long', 'none') } ) }} + {{ 'Since %date%'|trans( { '%date%' : address.validFrom|format_date('long') } ) }} {{ address_macros._render(address, { 'with_valid_from' : false, 'has_no_address': true } ) }} diff --git a/Resources/views/Person/create_review.html.twig b/Resources/views/Person/create_review.html.twig index d969f0ec1..2d01fb08e 100644 --- a/Resources/views/Person/create_review.html.twig +++ b/Resources/views/Person/create_review.html.twig @@ -51,7 +51,7 @@ {% endapply %} - {% if person.birthdate is not null %}{{ person.birthdate|format_date('long', 'none', app.request.locale) }}{% else %} {% endif %} + {% if person.birthdate is not null %}{{ person.birthdate|format_date('long') }}{% else %} {% endif %} {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{% else %}{{ 'Without nationality'|trans }}{% endif %} @@ -69,13 +69,13 @@
{{ person|chill_entity_render_string }}
{{ 'Date of birth'|trans }}
-
{{ birthdate|format_date('long', 'none', app.request.locale)|default( 'Unknown date of birth'|trans ) }}
+
{{ birthdate|format_date('long')|default( 'Unknown date of birth'|trans ) }}
{{ 'Gender'|trans }}
{{ gender|trans }}
{{ 'Creation date'|trans }}
-
{{ creation_date|format_date('long', 'none', app.request.locale) }}
+
{{ creation_date|format_date('long') }}
{% if form.altNames is defined %} {# mark as rendered #} diff --git a/Resources/views/Person/list.html.twig b/Resources/views/Person/list.html.twig index b51171068..19f0838dc 100644 --- a/Resources/views/Person/list.html.twig +++ b/Resources/views/Person/list.html.twig @@ -56,7 +56,7 @@ {% if person.birthdate is not null %} - {{ person.birthdate|format_date('long', 'none') }} + {{ person.birthdate|format_date('long') }} {% else %}{{ 'Unknown date of birth'|trans }}{% endif %} diff --git a/Resources/views/Person/list_by_phonenumber.html.twig b/Resources/views/Person/list_by_phonenumber.html.twig index c9667f3c9..e3196653f 100644 --- a/Resources/views/Person/list_by_phonenumber.html.twig +++ b/Resources/views/Person/list_by_phonenumber.html.twig @@ -55,7 +55,7 @@ - {% if person.birthdate is not null %}{{person.birthdate|format_date('long', 'none', app.request.locale) }}{% else %}{{ 'Unknown date of birth'|trans }}{% endif %} + {% if person.birthdate is not null %}{{person.birthdate|format_date('long') }}{% else %}{{ 'Unknown date of birth'|trans }}{% endif %}