diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index abfff78be..c6a87b87d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/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 -%}
-
+
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-
-
+
+
{% endblock content %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 3e4674ebf..8462c4178 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/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 -%}
-
+
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-
-
+
+
{% endblock personcontent %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
index 3e9d6c86f..b3520349b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
+++ b/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 %}
- {{ title|trans }}
-{% endblock %}
+{% block title %}{%- if 'DRAFT' == accompanyingCourse.step -%}{{ 'New accompanying course'|trans }}{%- else -%}{{ 'Edit Accompanying Course'|trans }}{%- endif -%}{% endblock %}
{% block content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
index e0e4df125..5dff4b074 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/household_history.html.twig
+++ b/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 %}
-
-
{{ block('title') }}
+
+
{{ 'household.Household history'|trans }}
{{ 'household.Household shared'|trans }}
{% set memberships = person.getHouseholdParticipationsShareHousehold() %}
@@ -63,7 +63,7 @@
{{ 'household.Household number'|trans({'household_num': p.household.id }) }}
-
{{ p.position.label|localize_translatable_string }} {% if p.holder %}{{ 'household.holder'|trans }}{% endif %}
+
{{ p.position.label|localize_translatable_string }} {% if p.holder %}{{ 'household.holder'|trans }}{% endif %}
{% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -72,7 +72,7 @@
{{ 'household.Any simultaneous members'|trans }}
{% 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 %}
{{'household.holder'|trans }} {% endif %}
@@ -139,10 +139,10 @@
- {{ p.position.label|localize_translatable_string }}
+ {{ p.position.label|localize_translatable_string }}
{% if p.holder %}
{{ 'household.holder'|trans }}
- {% endif %}
+ {% endif %}
{% set simultaneous = p.household.getMembersDuringMembership(p) %}
@@ -151,7 +151,7 @@
{{ 'household.Any simultaneous members'|trans }}
{% 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 %} {{'household.holder'|trans }} {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index 2558d7db8..05738effb 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/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
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 61a3cd035..e69651084 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/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