diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index 9874c8b19..78cd18814 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -9,12 +9,15 @@ 'Report list': 'Liste des rapports' Details: Détails Person: Personne -Scope: Scope +Scope: Cercle Date: Date User: Utilisateur 'Report type': 'Type de rapport' 'View the report': "Voir le rapport" 'Update the report': "Mettre à jour le rapport" +Report data: Données du rapport +'Report view : %name%': 'Rapport : %name%' +Report: Rapport #Flash messages 'Success : report created!': "Succès : le rapport a bien été créé !" diff --git a/Resources/views/Report/view.html.twig b/Resources/views/Report/view.html.twig index 686735448..3a6fde97f 100644 --- a/Resources/views/Report/view.html.twig +++ b/Resources/views/Report/view.html.twig @@ -21,6 +21,8 @@ {% block title %}{{ 'Report view' |trans() }}{% endblock title %} {% block personcontent %} + +

{{ 'Report view : %name%' | trans({ '%name%' : entity.cFGroup.getName|localize_translatable_string } ) }}

{{ 'Details'|trans }}

@@ -33,12 +35,14 @@
{{ entity.date|localizeddate('long', 'none') }}
{{ 'User'|trans }} :
{{ entity.user }}
-
{{ 'Report type'|trans }} :
-
{{ entity.cFGroup.getName(app.request.locale) }}
- - {{ chill_custom_fields_group_widget(entity.cFData, entity.cFGroup) }} + +

{{ 'Report data'|trans }}

+ +
+ {{ chill_custom_fields_group_widget(entity.cFData, entity.cFGroup) }} +
{% if is_granted('CHILL_REPORT_UPDATE', entity) %} {{ 'Update the report' | trans }} {% endif %} diff --git a/Resources/views/Timeline/report_person_context.html.twig b/Resources/views/Timeline/report_person_context.html.twig index 8ac8432f1..bba3714e7 100644 --- a/Resources/views/Timeline/report_person_context.html.twig +++ b/Resources/views/Timeline/report_person_context.html.twig @@ -12,7 +12,7 @@ {% if custom_fields_in_summary|length > 0 %}

-
+
{% for field in custom_fields_in_summary %} {% if field.type == 'title' %} {{ chill_custom_field_widget(report.cFData, field) }}