diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index f46e80cd2..81ebddc05 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -73,7 +73,7 @@
{% endif %}
{% if t.commentVisible %}
-
{{ 'Comment'|trans }}
+ {{ 'activity.comment'|trans }}
{%- if entity.comment.empty -%}
{{ 'No comment associated'|trans }}
{%- else -%}
@@ -120,17 +120,17 @@
{{ 'Edit'|trans }}
-
+
{# TODO
{% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
#}
-
+
{{ 'Delete'|trans }}
-
+
{#
{% endif %}
#}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
index 9cfd05a3e..2b4b4a9ea 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js
@@ -24,7 +24,7 @@ const addressMessages = {
flat: 'Appartement',
buildingName: 'Nom du bâtiment',
extra: 'Complément d\'adresse',
- distribution: 'Service particulier de distribution',
+ distribution: 'Cedex',
create_postal_code: 'Localité inconnue. Cliquez ici pour créer une nouvelle localité',
postalCode_name: 'Nom',
postalCode_code: 'Code postal',
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
index f15dd6143..63e0da95a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -43,7 +43,7 @@ const messages = {
check_all: "cocher tout",
reset: "réinitialiser",
redirect: {
- person: "Quitter la page et ouvrir le dossier",
+ person: "Quitter la page et ouvrir la fiche de l'usager",
thirdparty: "Quitter la page et voir le tiers",
}
},
@@ -57,7 +57,7 @@ const messages = {
show: {
person: "Détails de l'usager",
thirdparty: "Détails du tiers",
- file_person: "Ouvrir le dossier",
+ file_person: "Ouvrir la fiche de l'usager",
file_thirdparty: "Voir le Tiers",
},
edit: {
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
index de67602b4..2f086c9f5 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
@@ -139,7 +139,7 @@ class AccompanyingCourseController extends Controller
/**
* History page of Accompanying Course section
*
- * the page show anti chronologic history with all actions, title of page is 'accompanying course details'
+ * the page show anti chronologic history with all actions, title of page is 'Accompanying Course History'
*
* @Route("/{_locale}/parcours/{accompanying_period_id}/history", name="chill_person_accompanying_course_history")
* @ParamConverter("accompanyingCourse", options={"id": "accompanying_period_id"})
diff --git a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
index 744e5dbbe..df70b9e64 100644
--- a/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
+++ b/src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php
@@ -54,7 +54,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
return;
}
- $menu->addChild($this->translator->trans('Accompanying Course Details'), [
+ $menu->addChild($this->translator->trans('Accompanying Course History'), [
'route' => 'chill_person_accompanying_course_history',
'routeParameters' => [
'accompanying_period_id' => $period->getId()
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
index 5b0ada868..488dc3df9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
@@ -1,7 +1,7 @@
{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
{% block title %}
- {{ 'Accompanying Course Details'|trans }}
+ {{ 'Accompanying Course History'|trans }}
{% endblock %}
{% block content %}
@@ -15,8 +15,8 @@
Il faudrait peut-être modifier son adresse comme ceci: `/fr/parcours/{id}/timeline`
- {# start test flex-table
-
+ {# start test flex-table
+
{% for p in accompanyingCourse.participations %}
@@ -52,16 +52,16 @@
-
+
- Lorem ipsum dolor sit amet, incididunt ut labore et dolore magna aliqua.
+ Lorem ipsum dolor sit amet, incididunt ut labore et dolore magna aliqua.
- Rhoncus est pellentesque elit eu ultrices vitae auctor.
+ Rhoncus est pellentesque elit eu ultrices vitae auctor.
- Facilisis gravida neque convallis a cras semper auctor neque.
+ Facilisis gravida neque convallis a cras semper auctor neque.
{% endfor %}
@@ -70,5 +70,5 @@
{# end test flex-table #}
{# ==> insert accompanyingCourse vue component #}
-
+
{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 852f3256b..8b6b6db58 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -373,7 +373,7 @@ Confirmed: en file active
# Accompanying Course
Accompanying Course: Parcours d'accompagnement
-Accompanying Course Details: Détails du parcours
+Accompanying Course History: Historique du parcours
Resume Accompanying Course: Résumé du parcours
Show Accompanying Course: Voir le parcours
Edit Accompanying Course: Modifier le parcours