diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 574b12017..54cf7de0b 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -14,6 +14,7 @@ not present: absent
Delete: Supprimer
Update: Mettre à jour
Update activity: Édition de l'activité
+Scope: Cercle
#forms
Activity creation: Nouvelle activité
diff --git a/Resources/views/Activity/list.html.twig b/Resources/views/Activity/list.html.twig
index 5e2871555..c68371dd5 100644
--- a/Resources/views/Activity/list.html.twig
+++ b/Resources/views/Activity/list.html.twig
@@ -28,7 +28,6 @@
{{'Duration Time' | trans }} |
{{'Reason' | trans}} |
{{'Type' | trans}} |
- {{'Attendee' | trans }} |
|
|
@@ -40,7 +39,6 @@
{{ activity.durationTime|date('H:i') }} |
{{ activity.reason.name | localize_translatable_string }} |
{{ activity.type.name | localize_translatable_string }} |
- {{ activity.attendee }} |
{{ 'Show the activity' | trans }}
|
diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig
index 32717fa48..f09b3a8de 100644
--- a/Resources/views/Activity/show.html.twig
+++ b/Resources/views/Activity/show.html.twig
@@ -3,6 +3,8 @@
{% set activeRouteKey = 'chill_activity_activity_list' %}
{% block personcontent -%}
+ {{ "Activity"|trans }}
+
{{ 'Edit the activity'|trans }}
@@ -23,9 +25,9 @@
{{ 'Type'|trans }}
{{ entity.type.name | localize_translatable_string }}
{{ 'Attendee'|trans }}
- {{ entity.attendee }}
+ {% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}
{{ 'Remark'|trans }}
- {{ entity.remark }}
+ {% if entity.remark is empty %}{{ 'No remarks'|trans }}{% else %}{{ entity.remark }}
{% endif %}
{{ ''|trans }}
{{ ''|trans }}