Translation updatng

Controller/ReportController.php

@@ -156,7 +156,7 @@ class ReportController extends Controller
                 ->getFlashBag()
                 ->add('success', 
                     $this->get('translator')
-                    ->trans('Report created')
+                        ->trans('Success : report created!')
                 );
 
             return $this->redirect($this->generateUrl('report_view', 
@@ -166,7 +166,10 @@ class ReportController extends Controller
         $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
         $this->get('session')
-            ->getFlashBag()->add('danger', 'Errors : the report has not been created !');
+            ->getFlashBag()->add('danger',
+                $this->get('translator')
+                    ->trans('The form is not valid. The report has not been created !')
+            );
 
         return $this->render('ChillReportBundle:Report:new.html.twig', array(
             'entity' => $entity,
@@ -208,7 +211,8 @@ class ReportController extends Controller
         $entity = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$entity) {
-            throw $this->createNotFoundException('Unable to find Report entity.');
+            throw $this->createNotFoundException(
+                $this->get('translator')->trans('Unable to find this report.'));
         }
 
         return $this->render('ChillReportBundle:Report:view.html.twig', array(
@@ -228,11 +232,13 @@ class ReportController extends Controller
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException('Unable to find the report.');
+            throw $this->createNotFoundException(
+                $this->get('translator')->trans('Unable to find this report.'));
         }
 
         if(intval($person_id) !== intval($report->getPerson()->getId())) {
-            throw new Exception("This is not the report of the person", 1);
+            throw new Exception(
+                $this->get('translator')->trans('This is not the report of the person.'), 1);
         }
 
         $person = $report->getPerson();
@@ -276,7 +282,8 @@ class ReportController extends Controller
         $report = $em->getRepository('ChillReportBundle:Report')->find($report_id);
 
         if (!$report) {
-            throw $this->createNotFoundException('Unable to find the report '.$report_id.'.');
+            throw $this->createNotFoundException(
+                $this->get('translator')->trans('Unable to find this report.'));
         }
 
         $editForm = $this->createEditForm($report, $person_id);
@@ -289,7 +296,7 @@ class ReportController extends Controller
                 ->getFlashBag()
                 ->add('success', 
                     $this->get('translator')
-                    ->trans('Report updated')
+                        ->trans('Success : report updated!')
                 );
 
             return $this->redirect($this->generateUrl('report_view', 
@@ -299,7 +306,11 @@ class ReportController extends Controller
         $errors = $editForm->getErrorsAsString();
 
         $this->get('session')
-            ->getFlashBag()->add('danger', 'Errors : the report has not been updated !');
+            ->getFlashBag()
+            ->add('danger',
+                $this->get('translator')
+                    ->trans('The form is not valid. The report has not been updated !')
+            );
 
         return $this->render('ChillReportBundle:Report:edit.html.twig', array(
             'edit_form'   => $editForm->createView(),

Resources/translations/messages.fr.yml

@@ -6,9 +6,22 @@
 'Create a new report': 'Créer un nouveau rapport'
 'Report view': "Détails d'un rapport"
 'Update the report': 'Mettre à jour le rapport'
+'Report list': 'Liste des rapports'
 Details: Détails
 Person: Personne
 Scope: Scope
 Date: Date
 User: Utilisateur
-'Report type': 'Type de rapport'
+'Report type': 'Type de rapport'
+'View the report': "Voir le rapport"
+'Update the report': "Mettre à jour le rapport"
+
+#Flash messages
+'Success : report created!': "Succès : le rapport a bien été créé !"
+'The form is not valid. The report has not been created !': "Le formulaire comporte des erreurs, le rapport n'a pas été créé"
+'Success : report updated!': "Succès : le rapport a bien été mis à jour !"
+'The form is not valid. The report has not been updated !': "Le formulaire comporte des erreurs, le rapport n'a pas été mis à jour"
+
+#Exception messags
+'Unable to find this report.': Rapport introuvable.
+'This is not the report of the person.': "La personne et le rapport sélectionnés ne sont pas associés"

Resources/views/Report/list.html.twig

@@ -0,0 +1,46 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
+
+{% set activeRouteKey = 'report_select_type' %}
+
+{% block title %}{{ 'Report list' |trans }}{% endblock title %}
+
+{% block personcontent %}
+    <table class="" style="width:100%">
+        <thead>
+            <tr>
+                <th>{{ 'Date' | trans }}</th>
+                <th>{{ 'Report type' | trans }}</th>
+                <!-- <th>{{ 'Report scope' | trans }}</th> -->
+                <th></th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for report in reports %}
+            <tr>
+                <td>{% if report.date %}{{ report.date|date('d-m-Y') }}{% endif %}</td>
+                <td>{{ report.cFGroup.getName(app.request.locale)  }}</td>
+                <!-- <td>{{ report.scope }}</td> -->
+                <td><a href="{{ path('report_view', { 'person_id': report.person.id, 'report_id': report.id }) }}">{{ 'View the report' | trans }}</a></td>
+                <td><a href="{{ path('report_edit', { 'person_id': report.person.id, 'report_id': report.id }) }}">{{ 'Update the report' | trans }}</a></td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}