From 43c3cc26eaa25ce85a2fe62ffd12ff068c4bd1a1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 21 Oct 2024 15:27:23 +0200
Subject: [PATCH] Fix translation with gender

---
 .../Resources/views/Person/list_with_period.html.twig        | 4 ++--
 .../ChillPersonBundle/translations/messages+intl-icu.fr.yaml | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index c48771aac..d07799de2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -119,7 +119,7 @@
                                 {% endif %}
                             {% endfor %}
                             {% if participating %}
-                                {{ 'person.and_himself'|trans({'gender': person.gender}) }}
+                                {{ 'person.And himself'|trans({'gender': person.gender.genderTranslation.value}) }}
                             {% endif %}
                         </div>
                     </div>
@@ -131,7 +131,7 @@
                             <div class="wl-col title">
                                 <h3>
                                     {% if acp.requestorPerson is not null %}
-                                        {{ 'Requestor'|trans({'gender': acp.requestorPerson.gender}) }}
+                                        {{ 'Requestor'|trans({'gender': acp.requestorPerson.gender.genderTranslation.value}) }}
                                     {% else %}
                                         {{ 'Requestor'|trans({'gender': 'other'})}}
                                     {% endif %}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index eaeaf137d..1bab276e5 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -14,13 +14,14 @@ Requestor: >-
     }
 
 person:
-    and_himself: >-
+    from_the: depuis le
+    And himself: >-
         {gender, select,
             man {et lui-même}
             woman {et elle-même}
             neutral {et lui·elle-même}
+            other {et lui·elle-même}
         }
-    from_the: depuis le
 
 household:
     Household: Ménage