diff --git a/Resources/config/routing/activity.yml b/Resources/config/routing/activity.yml index 63d4c5723..b2bc76201 100644 --- a/Resources/config/routing/activity.yml +++ b/Resources/config/routing/activity.yml @@ -18,7 +18,7 @@ chill_activity_activity_new: menus: person: order: 200 - label: Add an activity + label: Add a new activity chill_activity_activity_create: path: /{_locale}/person/{person_id}/activity/create diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index cd3e69010..88934216a 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -1,5 +1,24 @@ +#general +Show the activity: Voir l'activité +Edit the activity: Modifier l'activité +Activity: Activité +Duration time: Durée +Duration Time: Durée +Reason: Sujet +Attendee: Présence de la personne +Remark: Notes +Add a new activity: Ajouter une nouvelle activité +Activity list: Liste des activités +present: présent +not present: absent +Delete: Supprimer + +#forms +Activity creation: Nouvelle activité +Create: Créer +Back to the list: Retour à la liste + #timeline '%user% has done an %activity_type% on %date%': %user% a effectué une activité de type "%activity_type%" le %date% -Activity: Activité -View the activity: Voir l'activité + diff --git a/Resources/views/Activity/new.html.twig b/Resources/views/Activity/new.html.twig index 645bf3cf7..7e036ef68 100644 --- a/Resources/views/Activity/new.html.twig +++ b/Resources/views/Activity/new.html.twig @@ -21,14 +21,14 @@ {% block title %}{{ 'Activity create' |trans }}{% endblock title %} {% block personcontent %} -

Activity creation

+

{{ "Activity creation"|trans }}

{{ form(form) }} diff --git a/Resources/views/Timeline/activity_person_context.html.twig b/Resources/views/Timeline/activity_person_context.html.twig index eea0dbd1d..381db4174 100644 --- a/Resources/views/Timeline/activity_person_context.html.twig +++ b/Resources/views/Timeline/activity_person_context.html.twig @@ -7,7 +7,7 @@ '%activity_type%': activity.type.name|localize_translatable_string, '%date%' : activity.date|localizeddate('long', 'none') } ) }} {{ 'View the activity'|trans }} + { 'person_id': person.id, 'id': activity.id} ) }}">{{ 'Show the activity'|trans }}