From 3e6c929150f50e9a086f3fd4d18e87b4686a9002 Mon Sep 17 00:00:00 2001
From: Marc Ducobu <marc@champs-libres.coop>
Date: Thu, 26 Feb 2015 19:03:14 +0100
Subject: [PATCH] Improving CSV genertion

---
 Controller/PersonController.php        | 2 +-
 Resources/views/Person/export.csv.twig | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Controller/PersonController.php b/Controller/PersonController.php
index e35623e8e..82b85caa3 100644
--- a/Controller/PersonController.php
+++ b/Controller/PersonController.php
@@ -192,7 +192,7 @@ class PersonController extends Controller
             array(
                 'persons' => $persons,
                 'cf_group' => $this->getCFGroup()));
-        $response->headers->set('Content-Type', 'text/csv');
+        $response->headers->set('Content-Type', 'text/csv; charset=utf-8');
         $response->headers->set('Content-Disposition', 'attachment; filename="export.csv"');
 
         return $response;
diff --git a/Resources/views/Person/export.csv.twig b/Resources/views/Person/export.csv.twig
index 10cdb3e21..342e87847 100644
--- a/Resources/views/Person/export.csv.twig
+++ b/Resources/views/Person/export.csv.twig
@@ -13,9 +13,9 @@
         #}"{{ chill_custom_field_label(customField) }}"{% if not loop.last %},{% endif %}{#
     #}{% endfor %}{#
 #}{% endif %}{#
-#}
 
-{% for person in persons %}{#
+#}{{ '\r\n'|raw }}{#
+#}{% for person in persons %}{#
     #}{{ person.id }},{#
     #}"{{ person.firstName|csv_cell }}",{#
     #}"{{ person.lastName|csv_cell }}",{#
@@ -55,6 +55,7 @@
             #}{% endif %}{#
             #}{% if not loop.last %},{% endif %}{#
         #}{% endfor %}{#
-    #}{% endif %}
+    #}{% endif %}{#
+    #}{{ '\r\n'|raw }}{#
 
-{% endfor %}
\ No newline at end of file
+#}{% endfor %}
\ No newline at end of file