diff --git a/Resources/views/Person/create_review.html.twig b/Resources/views/Person/create_review.html.twig index 8394eeff3..cdf3431f5 100644 --- a/Resources/views/Person/create_review.html.twig +++ b/Resources/views/Person/create_review.html.twig @@ -34,7 +34,7 @@ {{ person.dateOfBirth|date(date_format) }} - {{ person.nationality|default('person.without_nationality'|trans) }} + {% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{% else %}{{ 'views.Person.view.without_nationality'|trans }}{% endif %} {% endfor %} diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig index d906d09aa..90641002b 100644 --- a/Resources/views/Person/view.html.twig +++ b/Resources/views/Person/view.html.twig @@ -54,7 +54,7 @@ This view should receive those arguments:
{% spaceless %} {% if person.countryOfBirth is not null %} - {{ person.countryOfBirth.label }} + {{ person.countryOfBirth.name|localize_translatable_string }} {% else %} {{ 'views.Person.view.country_of_birth_unknow'|trans }} {% endif %} @@ -74,7 +74,7 @@ This view should receive those arguments:
{{ 'views.Person.view.nationality'|trans }}
{% if person.nationality is not null %} - {{ person.nationality.label }} + {{ person.nationality.name|localize_translatable_string }} {% else %} {{ 'views.Person.view.without_nationality'|trans }} {% endif %} diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index 999598c00..94148622a 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -35,7 +35,7 @@ {% endspaceless %}

{% if person.nationality is not null %} -

{{ person.nationality.label }}

+

{{ person.nationality.name|localize_translatable_string }}

{% else %}

{% trans %}views.layout.without_nationality{% endtrans %}

{% endif %}