diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 18f2bfc63..b6b829708 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.html.twig
@@ -32,20 +32,20 @@ This view should receive those arguments:
the page
#}
{% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig' %}
-{% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
+{% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
'form_path_key' : 'chill_person_general_edit' } %}
{% block personcontent %}
-
-
+
+
{% if person.memo is not empty %}
{{ 'Memo'|trans }}
-
+
{{ person.memo|nl2br }}
@@ -55,14 +55,14 @@ This view should receive those arguments:
{{ 'General information'|trans }}
-
+
{{ 'First name'|trans }} :
{{ person.firstName }}
-
+
{{ 'Last name'|trans }} :
{{ person.lastName }}
-
+
{{ 'Gender'|trans }} :
{{ ( person.gender|default('Not given'))|trans }}
@@ -87,14 +87,14 @@ This view should receive those arguments:
{{ 'Unknown date of birth'|trans }}
{%- endif -%}
-
+
{%- if chill_person.fields.place_of_birth == 'visible' -%}
{{ 'Place of birth'|trans }} :
{{ person.placeOfBirth }}
{%- endif -%}
{%- if chill_person.fields.country_of_birth == 'visible' -%}
{{ 'Country of birth'|trans }} :
-
{% spaceless %}
+
{% spaceless %}
{% if person.countryOfBirth is not null %}
{{ person.countryOfBirth.name|localize_translatable_string }}
{% else %}
@@ -126,7 +126,7 @@ This view should receive those arguments:
{% else %}
{{ 'Without nationality'|trans }}
{% endif %}
-
+
{%- endif -%}
{%- if chill_person.fields.spoken_languages == 'visible' -%}
@@ -180,7 +180,7 @@ This view should receive those arguments:
{{ 'Addresses\'history'|trans }}
{%- else -%}
- {{ 'No address given'|trans }}
+ {{ 'No address given'|trans }}
{{ 'Add an address'|trans }}
@@ -188,11 +188,11 @@ This view should receive those arguments:
{%- endif -%}
-
+
{%- if chill_person.fields.email == 'visible' -%}
{{ 'Email'|trans }} :
-
{% if person.email is not empty %}
{{ person.email}}
{% else %}{{ 'No data given'|trans }}{% endif %}
+
{% if person.email is not empty %}
{{ person.email|nl2br }}
{% else %}{{ 'No data given'|trans }}{% endif %}
{%- endif -%}
{%- if chill_person.fields.phonenumber == 'visible' -%}
@@ -216,7 +216,7 @@ This view should receive those arguments: