From 95027e93c6c26656ed19ac47fc04dcf24ce2dcf8 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Mon, 10 Jan 2022 12:41:47 +0100
Subject: [PATCH] fix translations for AddPersons in PickEntity

---
 .../Resources/public/module/pick-entity/index.js   |  8 +++++---
 .../public/vuejs/PickEntity/PickEntity.vue         | 14 +++++---------
 .../Resources/public/vuejs/PickEntity/i18n.js      | 10 +++++-----
 .../public/vuejs/_components/AddPersons.vue        |  2 --
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 21cc672b7..83a890cd9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -1,6 +1,9 @@
 import { createApp } from 'vue';
 import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue';
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
+import { appMessages } from 'ChillMainAssets/vuejs/PickEntity/i18n';
+
+const i18n = _createI18n(appMessages);
 
 window.addEventListener('DOMContentLoaded', function(e) {
 
@@ -11,8 +14,7 @@ window.addEventListener('DOMContentLoaded', function(e) {
         const
             isMultiple = parseInt(el.dataset.multiple) === 1,
             input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
-            picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)],
-            i18n = _createI18n({});
+            picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)];
 
         createApp({
             template: '<pick-entity ' +
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index eb4ca96ba..43f3ebf94 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -9,8 +9,8 @@
             <AddPersons
                 :options="addPersonsOptions"
                 :key="uniqid"
-                buttonTitle="pick_person.add"
-                modalTitle="translatedListOfTypes"
+                :buttonTitle="translatedListOfTypes"
+                :modalTitle="translatedListOfTypes"
                 ref="addPersons"
                 @addNewPersons="addNewEntity"
             >
@@ -21,13 +21,10 @@
 
 <script>
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
-import messages from "./i18n";
-
-console.log('messages', messages);
+import { appMessages } from "./i18n";
 
 export default {
     name: "PickEntity",
-    messages,
     props: {
         multiple: {
             type: Boolean,
@@ -69,10 +66,9 @@ export default {
         translatedListOfTypes() {
             let trans = [];
             this.types.forEach(t => {
-                trans.push(this.$t('pick_entity.'.t));
+                trans.push(appMessages.fr.pick_entity[t].toLowerCase());
             })
-
-            return trans.join(', ');
+            return appMessages.fr.pick_entity.modal_title + trans.join(', ');
         }
     },
     methods: {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
index 78a0a9c90..2c4432218 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/i18n.js
@@ -1,10 +1,10 @@
-import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
 
-const messages = {
+const appMessages = {
     fr: {
         pick_entity: {
             add: 'Ajouter',
-            modal_title: 'Ajouter des',
+            modal_title: 'Ajouter des ',
             user: 'Utilisateurs',
             person: 'Usagers',
             thirdparty: 'Tiers',
@@ -12,6 +12,6 @@ const messages = {
     }
 }
 
-const full = Object.assign(messages, personMessages);
+Object.assign(appMessages.fr, personMessages.fr);
 
-export default full;
+export { appMessages };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index f384aae54..f118671ed 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -93,11 +93,9 @@ import PersonSuggestion from './AddPersons/PersonSuggestion';
 import { searchEntities } from 'ChillPersonAssets/vuejs/_api/AddPersons';
 import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
-import {messages} from 'ChillPersonAssets/vuejs/_js/i18n.js';
 
 export default {
    name: 'AddPersons',
-   messages,
    components: {
       Modal,
       PersonSuggestion,