localize countries names according to IssueId #299 and IssueId #317

[ci skip]
This commit is contained in:
Julien Fastré 2014-11-17 01:04:17 +01:00
parent 51c480ab2f
commit 2aa21b7652
3 changed files with 4 additions and 4 deletions

View File

@ -34,7 +34,7 @@
</a> </a>
</td> </td>
<td>{{ person.dateOfBirth|date(date_format) }}</td> <td>{{ person.dateOfBirth|date(date_format) }}</td>
<td>{{ person.nationality|default('person.without_nationality'|trans) }} <td>{% if person.nationality is not null %}{{ person.nationality.name|localize_translatable_string }}{% else %}{{ 'views.Person.view.without_nationality'|trans }}{% endif %}
</tr> </tr>
{% endfor %} {% endfor %}

View File

@ -54,7 +54,7 @@ This view should receive those arguments:
<dd>{% spaceless %} <dd>{% spaceless %}
{% if person.countryOfBirth is not null %} {% if person.countryOfBirth is not null %}
{{ person.countryOfBirth.label }} {{ person.countryOfBirth.name|localize_translatable_string }}
{% else %} {% else %}
{{ 'views.Person.view.country_of_birth_unknow'|trans }} {{ 'views.Person.view.country_of_birth_unknow'|trans }}
{% endif %} {% endif %}
@ -74,7 +74,7 @@ This view should receive those arguments:
<dt class="inline">{{ 'views.Person.view.nationality'|trans }}</dt> <dt class="inline">{{ 'views.Person.view.nationality'|trans }}</dt>
<dd> <dd>
{% if person.nationality is not null %} {% if person.nationality is not null %}
{{ person.nationality.label }} {{ person.nationality.name|localize_translatable_string }}
{% else %} {% else %}
{{ 'views.Person.view.without_nationality'|trans }} {{ 'views.Person.view.without_nationality'|trans }}
{% endif %} {% endif %}

View File

@ -35,7 +35,7 @@
{% endspaceless %}</p> {% endspaceless %}</p>
{% if person.nationality is not null %} {% if person.nationality is not null %}
<p><i class="fa fa-flag"></i> {{ person.nationality.label }}</p> <p><i class="fa fa-flag"></i> {{ person.nationality.name|localize_translatable_string }}</p>
{% else %} {% else %}
<p class="without_nationality"><i class="fa fa-flag"></i> {% trans %}views.layout.without_nationality{% endtrans %}</p> <p class="without_nationality"><i class="fa fa-flag"></i> {% trans %}views.layout.without_nationality{% endtrans %}</p>
{% endif %} {% endif %}