fix title of page translations and coherency

src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig

@@ -2,14 +2,14 @@
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
-{% block title 'Activity'|trans %}
+{% block title 'Show the activity'|trans %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
 <div class="activity-show">
-            
+
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-            
+
-</div> 
+</div>
 {% endblock content %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig

@@ -2,14 +2,14 @@
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
-{% block title 'Activity'|trans %}
+{% block title 'Show the activity'|trans %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
 <div class="activity-show">
-            
+
             {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-            
+
-</div>                
+</div>
 {% endblock personcontent %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig

@@ -1,10 +1,6 @@
 {% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
-{% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
+{% block title %}{%- if 'DRAFT' == accompanyingCourse.step -%}{{ 'New accompanying course'|trans }}{%- else -%}{{ 'Edit Accompanying Course'|trans }}{%- endif -%}{% endblock %}
-
-{% block title %}
-    {{ title|trans }}
-{% endblock %}
 
 {% block content %}
    <div id="accompanying-course"></div> {#  <== insert accompanyingCourse vue component  #}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig

@@ -2,7 +2,7 @@
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
-{% block title %}{{ 'Accompanying period list'|trans }}{% endblock title %}
+{% block title %}{{ 'Accompanying period list for person'|trans }}{% endblock title %}
 
 {% block personcontent %}
 <div class="person-accompanyingperiods">

src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig

@@ -2,12 +2,12 @@
 
 {% set activeRouteKey = 'chill_person_view' %}
 
-{% block title 'household.Household history for %name%'|trans({'name': person|chill_entity_render_string}) %}
+{% block title 'household.Household history for person'|trans %}
 
 {% block personcontent %}
 <div class="person-household">
-                
+
-            <h1>{{ block('title') }}</h1>
+            <h1>{{ 'household.Household history'|trans }}</h1>
             <h2>{{ 'household.Household shared'|trans }}</h2>
 
             {% set memberships = person.getHouseholdParticipationsShareHousehold() %}
@@ -63,7 +63,7 @@
                                                 {{ 'household.Household number'|trans({'household_num': p.household.id }) }}
                                             </a>
                                         </p>
-                                        <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %} 
+                                        <p>{{ p.position.label|localize_translatable_string }} {% if p.holder %}<span class="badge bg-primary">{{ 'household.holder'|trans }}</span>{% endif %}
                                     </div>
                                     <div>
                                         {% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -72,7 +72,7 @@
                                                 {{ 'household.Any simultaneous members'|trans }}
                                             </p>
                                         {% else %}
-                                            {{ 'household.Members at same time'|trans }}: 
+                                            {{ 'household.Members at same time'|trans }}:
                                             {% for p in simultaneous -%}
                                                 {{- p.person|chill_entity_render_box({'addLink': true }) -}}
                                                 {%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}
@@ -139,10 +139,10 @@
                                     </a>
                                 </p>
                                 <p>
-                                    {{ p.position.label|localize_translatable_string }} 
+                                    {{ p.position.label|localize_translatable_string }}
                                     {% if p.holder %}
                                         <span class="badge bg-primary">{{ 'household.holder'|trans }}</span>
-                                    {% endif %} 
+                                    {% endif %}
                                 </div>
                                 <div>
                                 {% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -151,7 +151,7 @@
                                         {{ 'household.Any simultaneous members'|trans }}
                                     </p>
                                 {% else %}
-                                    {{ 'household.Members at same time'|trans }}: 
+                                    {{ 'household.Members at same time'|trans }}:
                                     {% for p in simultaneous -%}
                                         {{- p.person|chill_entity_render_box({'addLink': true }) -}}
                                         {%- if p.holder %} <span class="badge bg-primary">{{'household.holder'|trans }}</span> {% endif %}

src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml

@@ -37,7 +37,7 @@ household:
     holder: Titulaire
     Edit member household: Modifier l'appartenance au ménage
     Current household members: Membres actuels
-    Household summary: Résumé
+    Household summary: Résumé du ménage
     Accompanying period: Parcours d'accompagnement
     Addresses: Adresses
     Current address: Adresse actuelle
@@ -58,6 +58,8 @@ household:
     expecting_birth: Naissance attendue ?
     date_expecting_birth: Date de la naissance attendue
     data_saved: Données enregistrées
+    Household history: Historique des ménages
+    Household history for person: Historique des ménages de la personne
     Household history for %name%: Historique des ménages pour {name}
     Household shared: Ménages domiciliés
     Household not shared: Ménage non domiciliés

src/Bundle/ChillPersonBundle/translations/messages.fr.yml

@@ -169,6 +169,7 @@ 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 list for person: Périodes d'accompagnement de la personne
 Accompanying period: Parcours d'accompagnement
 period: Parcours
 New accompanying course: Nouveau parcours d'accompagnement