From 0135f5184e736b32f5b9be15037042f49920a9b1 Mon Sep 17 00:00:00 2001 From: nobohan Date: Tue, 29 Jun 2021 17:09:24 +0200 Subject: [PATCH] accompanying period: wording + minor changes in twig --- .../Resources/views/AccompanyingPeriod/list.html.twig | 10 +++++++--- .../ChillPersonBundle/translations/messages.fr.yml | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig index bf3392f6d..d99d6b2ef 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig @@ -10,12 +10,16 @@ {% for accompanying_period in accompanying_periods %} -
- {{'Accompanying period'|trans}} #{{ accompanying_period.id }} + {{'period'|trans}} #{{ accompanying_period.id }} + {% if accompanying_period.emergency %} + + {{- 'Emergency'|trans -}} + + {% endif %}
@@ -63,7 +67,7 @@ {% endif %}
-

{{ 'Requestors'|trans }}

+

{{ 'Requestor'|trans }}

{% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %} {% if accompanying_period.requestorPerson is not null %}

{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}

diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index ec5bacec7..b27128ff7 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -165,7 +165,8 @@ An accompanying period starts: Une période d'accompagnement est ouverte Any accompanying periods are open: Aucune période d'accompagnement ouverte An accompanying period is open: Une période d'accompagnement est ouverte Accompanying period list: Périodes d'accompagnement -Accompanying period: Période d'accompagnement +Accompanying period: Parcours d'accompagnement +period: Parcours New accompanying course: Nouveau parcours d'accompagnement Choose a motive: Motif de fermeture Re-open accompanying period: Ré-ouvrir @@ -190,6 +191,8 @@ See accompanying period: Voir cette période d'accompagnement Referrer: Référent Some peoples does not belong to any household currently. Add them to an household soon: Certaines personnes n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible. Add to household now: Ajouter à un ménage +Requestor: Demandeur + # pickAPersonType Pick a person: Choisir une personne