From 06cb3ddcd16c6d37158b737a987e32ccb25f5c79 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 1 Oct 2024 13:35:06 +0200
Subject: [PATCH] Adjust translation logic for gender in vue components

---
 src/Bundle/ChillMainBundle/Entity/Gender.php  |  1 +
 .../Resources/public/vuejs/_js/i18n.ts        |  3 ++-
 .../components/MemberDetails.vue              |  2 +-
 .../Resources/public/vuejs/VisGraph/i18n.js   |  6 +-----
 .../Resources/public/vuejs/VisGraph/store.js  |  4 ++--
 .../public/vuejs/VisGraph/vis-network.js      | 20 -------------------
 .../_components/Entity/PersonRenderBox.vue    | 11 +---------
 .../vuejs/_components/OnTheFly/Person.vue     |  6 +++---
 .../Resources/public/vuejs/_js/i18n.ts        |  4 ++--
 9 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/Gender.php b/src/Bundle/ChillMainBundle/Entity/Gender.php
index 2c4667e46..6a96e864a 100644
--- a/src/Bundle/ChillMainBundle/Entity/Gender.php
+++ b/src/Bundle/ChillMainBundle/Entity/Gender.php
@@ -26,6 +26,7 @@ class Gender
     private bool $active = true;
 
     #[Assert\NotNull(message: 'You must choose a gender translation')]
+    #[Serializer\Groups(['read'])]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, enumType: GenderEnum::class)]
     private GenderEnum $genderTranslation;
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
index f81699a7c..1e2844f3e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
@@ -38,7 +38,8 @@ const messages = {
          person: "Usager",
          birthday: {
             man: "Né le",
-            woman: "Née le"
+            woman: "Née le",
+            neutral: "Né·e le"
          },
          deathdate: "Date de décès",
          household_without_address: "Le ménage de l'usager est sans adresse",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index 2258d8b77..fd2ef7bdb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -8,7 +8,7 @@
             {{ $t('household_members_editor.holder') }}
           </span>
         </div>
-        <div v-if="conc.person.birthdate !== null">{{ $t('person.born', {'gender': conc.person.gender} ) }}</div>
+        <div v-if="conc.person.birthdate !== null">{{ $t('person.born', {'gender': conc.person.gender.genderTranslation} ) }}</div>
       </div>
       <div class="item-col">
         <ul class="list-content fa-ul">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index 474788f47..6c631a0ea 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -12,10 +12,6 @@ const visMessages = {
             Holder: 'Titulaire',
             Legend: 'Calques',
             concerned: 'concerné',
-            // both: 'neutre, non binaire',
-            woman: 'féminin',
-            man: 'masculin',
-            undefined: "genre non précisé",
             years: 'ans',
             click_to_expand: 'cliquez pour étendre',
             add_relationship_link: "Créer un lien de filiation",
@@ -64,7 +60,7 @@ const visMessages = {
                 placeholder: "Choisissez le genre de l'usager",
                 woman: "Féminin",
                 man: "Masculin",
-                both: "Neutre, non binaire",
+                neutral: "Neutre, non binaire",
                 undefined: "Non renseigné",
                 unknown: "Non renseigné"
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
index 8382d460d..683dd840a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js
@@ -1,6 +1,6 @@
 import { createStore } from 'vuex'
 import { getHouseholdByPerson, getCoursesByPerson, getRelationshipsByPerson } from './api'
-import { getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getGender, getAge } from './vis-network'
+import { getHouseholdLabel, getHouseholdWidth, getRelationshipLabel, getRelationshipTitle, getRelationshipDirection, splitId, getAge } from './vis-network'
 import {visMessages} from "./i18n";
 import { darkBlue, darkBrown, darkGreen, lightBlue, lightBrown, lightGreen } from './colors';
 
@@ -148,7 +148,7 @@ const store = createStore({
             person.group = person.type
             person._id = person.id
             person.id = `person_${person.id}`
-            person.label = `*${person.text}${person.deathdate ? ' (‡)' : ''}*\n_${getGender(person.gender)}${age}_${debug}`
+            person.label = `*${person.text}${person.deathdate ? ' (‡)' : ''}*\n_${person.gender.label.fr}${age}_${debug}`
             person.folded = false
             // folded is used for missing persons
             if (options.folded) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
index cb37c3661..4c279bcfa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/vis-network.js
@@ -141,25 +141,6 @@ window.options = {
     }
 }
 
-/**
- * @param gender
- * @returns {string}
- */
-const getGender = (gender) => {
-    switch (gender) {
-        case 'both':
-            return visMessages.fr.visgraph.both
-        case 'woman':
-            return visMessages.fr.visgraph.woman
-        case 'man':
-            return visMessages.fr.visgraph.man
-        case 'unknown':
-            return visMessages.fr.visgraph.unknown
-        default:
-            return visMessages.fr.visgraph.undefined
-    }
-}
-
 /**
  * TODO only one abstract function (-> getAge() is repeated in PersonRenderBox.vue)
  * @param person
@@ -251,7 +232,6 @@ const splitId = (id, position) => {
 }
 
 export {
-    getGender,
     getAge,
     getHouseholdLabel,
     getHouseholdWidth,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 525f217ed..df3e77897 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -39,7 +39,7 @@
             <p v-if="options.addInfo === true" class="moreinfo">
               <gender-icon-render-box v-if="person.gender" :gender="person.gender"></gender-icon-render-box>
               <time v-if="person.birthdate && !person.deathdate" :datetime="person.birthdate" :title="birthdate">
-                {{ $t(getGenderTranslation) + ' ' + $d(birthdate, 'text') }}
+                {{ $t(`renderbox.birthday.${person.gender.genderTranslation}`) + ' ' + $d(birthdate, 'text') }}
               </time>
 
               <time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate"
@@ -223,15 +223,6 @@ export default {
         return false
       }
     },
-/*    getGenderIcon: function () {
-      return this.person.gender === 'woman' ? 'fa-venus' : this.person.gender === 'man' ? 'fa-mars' : this.person.gender === 'both' ? 'fa-neuter' : 'fa-genderless';
-    },*/
-    getGenderTranslation: function () {
-      return this.person.gender === 'woman' ? 'renderbox.birthday.woman' : 'renderbox.birthday.man';
-    },
-    getGender() {
-      return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : this.person.gender === 'both' ? 'person.gender.both' : 'person.gender.undefined';
-    },
     birthdate: function () {
       if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
         return ISOToDate(this.person.birthdate.datetime);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 5a13820e9..c61a7002a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -300,13 +300,13 @@ export default {
          }
       },
       genderTranslation() {
-         switch (this.person.gender) {
+         switch (this.person.gender.genderTranslation) {
             case 'woman':
                return 'person.gender.woman';
             case 'man':
                return 'person.gender.man';
-            case 'both':
-               return 'person.gender.both';
+            case 'neutral':
+               return 'person.gender.neutral';
            case 'unknown':
                return 'person.gender.unknown';
            default:
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
index 96cc73e07..6ad306350 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
@@ -15,7 +15,7 @@ const personMessages = {
       person: {
          firstname: "Prénom",
          lastname: "Nom",
-         born: (ctx: {gender: "man"|"woman"|"unknown"}) => {
+         born: (ctx: {gender: "man"|"woman"|"neutral"}) => {
           if (ctx.gender === 'man') {
             return 'Né le';
           } else if (ctx.gender === 'woman') {
@@ -36,7 +36,7 @@ const personMessages = {
             placeholder: "Choisissez le genre de l'usager",
             woman: "Féminin",
             man: "Masculin",
-            both: "Neutre, non binaire",
+            neutral: "Neutre, non binaire",
             unknown: "Non renseigné",
             undefined: "Non renseigné"
          },