diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index cb9392ac0..ed5b31596 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -18,7 +18,7 @@ Moderator: Animateur
Details of an event: Détails d'un événement
New event: Nouvel événement
Back to the most recent events: Retour aux derniers événements
-Back to the person events: Retour aux événements de la personne
+'Back to %person% events': Retour aux événements de %person%
Event creation: Création d'un événement
Add an event: Ajouter un événement
Event edit: Modifier un événement
diff --git a/Resources/views/Event/listByPerson.html.twig b/Resources/views/Event/listByPerson.html.twig
index 4c17630e4..ea18e8d19 100644
--- a/Resources/views/Event/listByPerson.html.twig
+++ b/Resources/views/Event/listByPerson.html.twig
@@ -17,6 +17,7 @@
{% extends "ChillPersonBundle::layout.html.twig" %}
{% set activeRouteKey = 'chill_event__list_by_person' %}
+{% set currentPerson = person.firstName ~ ' ' ~ person.lastName %}
{% block title %}{{ 'Events participation' |trans }}{% endblock title %}
@@ -46,7 +47,7 @@
-
{% set currentPath = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
- {% set returnLabel = 'Back to the person events'|trans %}
+ {% set returnLabel = 'Back to %person% events'|trans({ '%person%' : currentPerson } ) %}
{# temporaire --
TODO corriger EventVoter.php pour régler les autorisations sur les boutons, puis remplacer ci-dessous par le code commenté #}
@@ -84,7 +85,7 @@
'event_id' : participation.event.id,
'return_path' : currentPath,
'return_label' : returnLabel
- } ) }}" class="sc-button bt-show">
+ } ) }}" class="sc-button bt-show">
{% endif %}
{% if is_granted('CHILL_EVENT_UPDATE', participation.event)
@@ -145,7 +146,7 @@
{% endif %}
{#
-#}
{{ dump() }}
+#}
{% endblock %}
\ No newline at end of file
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index c5af27003..451c52e4e 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -34,8 +34,10 @@
+
{% set returnPath = app.request.get('return_path') %}
{% set returnLabel = app.request.get('return_label') %}
+
{% if returnPath and returnLabel %}
-
{{ returnLabel }}