From 21acbc7a06e128a83dc75f79e1355965d9fde3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 1 Jul 2020 17:35:16 +0200
Subject: [PATCH] fix capitalization of title on person document pages

---
 CHANGELOG.md                                   | 5 +++++
 Resources/translations/messages.fr.yml         | 3 ++-
 Resources/views/PersonDocument/edit.html.twig  | 2 +-
 Resources/views/PersonDocument/index.html.twig | 4 ++--
 Resources/views/PersonDocument/new.html.twig   | 4 ++--
 Resources/views/PersonDocument/show.html.twig  | 4 ++--
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad4ff222..1d9c05143 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,3 +32,8 @@ Version 1.5.5
 
 - add button to remove existing document in form, and improve UI in this part
 - fix error when document is removed in form
+
+Master branch
+=============
+
+- fix capitalization of person document pages
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 5e46490a6..3d69655d7 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -15,6 +15,7 @@ No document to download: Aucun document à télécharger
 Any document found: Aucun document trouvé
 The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
+Any description: Aucune description
 
 # dropzone upload
 File too big: Fichier trop volumineux
@@ -24,4 +25,4 @@ Max files exceeded. Remove previous files: Nombre maximum de fichier atteint. Su
 Cancel upload: Annuler le téléversement
 Are you sure you want to cancel this upload ?: Êtes-vous sûrs de vouloir annuler ce téléversement ?
 Upload canceled: Téléversement annulé
-Remove existing file: Supprimer le document existant
\ No newline at end of file
+Remove existing file: Supprimer le document existant
diff --git a/Resources/views/PersonDocument/edit.html.twig b/Resources/views/PersonDocument/edit.html.twig
index 6c18e8474..704031abb 100644
--- a/Resources/views/PersonDocument/edit.html.twig
+++ b/Resources/views/PersonDocument/edit.html.twig
@@ -19,7 +19,7 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 {% block personcontent %}
     <h1>{{ 'Edit Document' | trans }}</h1>
     
diff --git a/Resources/views/PersonDocument/index.html.twig b/Resources/views/PersonDocument/index.html.twig
index 34cb0e905..5f6f3632a 100644
--- a/Resources/views/PersonDocument/index.html.twig
+++ b/Resources/views/PersonDocument/index.html.twig
@@ -21,14 +21,14 @@
 
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
 
-{% block title %}{{ 'Documents for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
     <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
 {% endblock %}
 
 {% block personcontent %}
-    <h1>{{ 'Documents for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}</h1>
+    <h1>{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
 
     <table class="table">
         <thead>
diff --git a/Resources/views/PersonDocument/new.html.twig b/Resources/views/PersonDocument/new.html.twig
index fe807f3b3..7a643b985 100644
--- a/Resources/views/PersonDocument/new.html.twig
+++ b/Resources/views/PersonDocument/new.html.twig
@@ -18,10 +18,10 @@
 
 {% set activeRouteKey = '' %}
 
-{% block title %}{{ 'New document for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block personcontent %}
-    <h1>{{ 'New document for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}</h1>
+    <h1>{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
     
     {{ form_errors(form) }}
 
diff --git a/Resources/views/PersonDocument/show.html.twig b/Resources/views/PersonDocument/show.html.twig
index 989cd1a07..5a929d5ea 100644
--- a/Resources/views/PersonDocument/show.html.twig
+++ b/Resources/views/PersonDocument/show.html.twig
@@ -20,7 +20,7 @@
 
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
 
-{% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName } )|capitalize }}{% endblock %}
+{% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
     <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         <dt>{{ 'Description' | trans }}</dt>
         <dd>
             {% if document.description is empty %}
-            <span class="chill-no-data-statement">{{ 'Any description' }}</span>
+            <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
             {% else %}
             <blockquote class="chill-user-quote">
                 {{ document.description }}