Merge branch 'stable' of framagit.org:Chill-Project/Chill-Person into stable

CHANGELOG.md

@@ -28,5 +28,10 @@ Version 1.5.3
 Version 1.5.4
 =============
 
+- add filenumber in person header
+
+Version 1.5.5
+=============
+
 - Fix bug in accompanying period filter
 

Resources/translations/messages.fr.yml

@@ -65,6 +65,7 @@ Married: Marié(e)
 'Family information': Famille
 'Contact information': 'Informations de contact'
 'Administrative information': Administratif
+File number: Dossier n°
 
 # addresses part
 address_street_address_1: Adresse ligne 1

Resources/views/layout.html.twig

@@ -35,6 +35,8 @@
                 <span class="open_sansbold">{{ 'First name'|trans|upper}}&nbsp;:</span> {{  person.firstName|upper }}
             </div>
             <div class="grid-3">
+                <span class="open_sansbold">{{ 'File number'|trans|upper}}&nbsp;:</span> {{  person.id|upper }}
+                                    &mdash;
                 <i class="fa  fa-{% spaceless %}
                     {% if person.gender == "woman" %}
                        female
@@ -44,13 +46,6 @@
                         male
                     {% endif %}
                 {% endspaceless %}"></i>
-                <i class="fa  fa-{% spaceless %}
-                    {% if person.isOpen %}
-                        eye
-                    {% else %}
-                       eye-slash
-                    {% endif %}
-                {% endspaceless %}"></i>
             </div> 
         </div>
     </div>
@@ -77,14 +72,7 @@
             {%- endif -%}
             {%- if chill_person.fields.spoken_languages == 'visible' -%}
             <div class="grid-3">
-                <span class="open_sansbold">{{ 'Spoken languages'|trans|upper}}&nbsp;:</span>
+                <span class="open_sansbold">{{ 'Center'|trans|upper}}&nbsp;:</span> {{  person.center.name|upper }}
-                {% if person.spokenLanguages|length == 0 %}
-                    {{ 'Unknown spoken languages'|trans }}
-                {% else %}
-                    {% for lang in person.spokenLanguages %}
-                        {{ lang.name|localize_translatable_string }}{% if not loop.last %},{% endif %}
-                    {% endfor %}
-                {% endif %}
             </div>
             {%- endif -%}
         </div>