Adjust translation logic for gender in vue components

2025-06-07 18:44:08 +00:00 · 2024-10-01 13:35:06 +02:00 · 2024-10-01 13:35:06 +02:00 · 06cb3ddcd1
commit 06cb3ddcd1
parent 05d56c6eeb
9 changed files with 13 additions and 44 deletions
--- 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;

--- 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",
--- 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">
--- 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é"
            }
--- 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) {
--- 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,
--- 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);
--- 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:
--- 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é"
         },