From d736a9a1f9690b6e1b83d8e3a4785948f598815f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Wed, 19 Nov 2014 00:26:32 +0100
Subject: [PATCH 1/2] Add nullable: true to default phonenumber

this caused a NOT NULL error on postgresql

[ci skip] refs #320
---
 Resources/config/doctrine/Person.orm.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/config/doctrine/Person.orm.yml b/Resources/config/doctrine/Person.orm.yml
index 7156a1626..ec381acbe 100644
--- a/Resources/config/doctrine/Person.orm.yml
+++ b/Resources/config/doctrine/Person.orm.yml
@@ -37,7 +37,8 @@ Chill\PersonBundle\Entity\Person:
         cFData:
             type: array
         phonenumber:
-            type:text
+            type: text
+            nullable: true
     manyToOne:
         countryOfBirth:
             targetEntity: Chill\MainBundle\Entity\Country

From beafcd902ea960e5acd1b6074159a3b437377cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien@fastre.info>
Date: Wed, 19 Nov 2014 00:49:49 +0100
Subject: [PATCH 2/2] Localize nationality in person list

---
 Resources/views/Person/list.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/views/Person/list.html.twig b/Resources/views/Person/list.html.twig
index 3642eeb33..9daba39df 100644
--- a/Resources/views/Person/list.html.twig
+++ b/Resources/views/Person/list.html.twig
@@ -44,7 +44,7 @@
                     </td>
                     <td>
                         {% if person.nationality is not null %}
-                            <span class="personNationality">{{person.nationality.label}}</span>
+                            <span class="personNationality">{{person.nationality.name | localize_translatable_string }}</span>
                         {% else %}
                             {{ 'views.Person.list.without_nationality'|trans }}
                         {% endif %}