From 4900c81c11f567d7913abf2d39fdaa0ee6ab5606 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 30 Apr 2021 14:59:14 +0200
Subject: [PATCH] improve inheritance with translations i18n.js files

vue-i18n --> chill main i18n ---( )---> app index
chill bundle i18n --> app i18n --^
---
 .../Resources/public/vuejs/_js/i18n.js        | 52 +++++++++++++++++++
 .../components/AccompanyingCourse.vue         |  2 +-
 .../components/PersonsAssociated.vue          |  2 +-
 .../components/Requestor.vue                  |  4 +-
 .../public/vuejs/AccompanyingCourse/index.js  | 13 ++---
 .../vuejs/AccompanyingCourse/js/i18n.js       | 21 ++++----
 .../Resources/public/vuejs/_js/i18n.js        | 39 ++------------
 7 files changed, 74 insertions(+), 59 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
new file mode 100644
index 000000000..2c2501d69
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js
@@ -0,0 +1,52 @@
+import { createI18n } from 'vue-i18n'
+
+const datetimeFormats = {
+   fr: {
+      short: {
+         year: "numeric",
+         month: "numeric",
+         day: "numeric"
+      },
+      long: {
+         year: "numeric",
+         month: "short",
+         day: "numeric",
+         weekday: "short",
+         hour: "numeric",
+         minute: "numeric",
+         hour12: false
+      }
+   }
+};
+const messages = {
+   fr: {
+      action: {
+         actions: "Actions",
+         show: "Voir",
+         edit: "Modifier",
+         create: "Créer",
+         remove: "Enlever",
+         delete: "Supprimer",
+         save: "Enregistrer",
+         show_modal: "Ouvrir une modale",
+         ok: "OK",
+         cancel: "Annuler",
+         close: "Fermer",
+         next: "Suivant",
+         previous: "Précédent",
+         back: "Retour"
+      },
+   }
+};
+
+const _createI18n = (appMessages) => {
+   Object.assign(messages.fr, appMessages.fr);
+   return createI18n({
+      datetimeFormats,
+      messages,
+      locale: 'fr',
+      fallbackLocale: 'fr'
+   })
+};
+
+export { _createI18n }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
index cecd12917..4a5ad0ab1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AccompanyingCourse.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="vue-component">
-      <h3>{{ $t('title.course') }}</h3>
+      <h3>{{ $t('course.title') }}</h3>
       <dl>
          <dt>{{ $t('course.id') }}</dt>
             <dd>{{ accompanying_course.id }}</dd>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index ab58ac050..c52cd514f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h3>{{ $t('title.persons_associated')}}</h3>
+   <h3>{{ $t('persons_associated.title')}}</h3>
    <label>{{ $tc('persons_associated.counter', counter) }}</label>
    <table class="rounded"> 
       <thead>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 7e082d5b1..baa1445ee 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="vue-component">
-   <h3>{{ $t('title.requestor') }}</h3>
+   <h3>{{ $t('requestor.title') }}</h3>
    {{ accompanying_course.id }}
    {{ accompanying_course.remark }}<br><br>
    
@@ -8,7 +8,7 @@
    <ul class="record_actions">
       <li>
          <button class="sc-button bt-create" @click="modal1.showModal = true">
-            {{ $t('action.showModal') }}
+            {{ $t('action.show_modal') }}
          </button>
       </li>
       <li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
index 6b1342aac..b1f6dee0e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js
@@ -1,7 +1,7 @@
 import { createApp } from 'vue'
-import { createI18n } from 'vue-i18n'
-import { datetimeFormats, messages } from './js/i18n'
-import { getDataPromise, postDataPromise } from './store'
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { appMessages } from './js/i18n'
+import { getDataPromise } from './store'
 
 import App from './App.vue';
 
@@ -10,12 +10,7 @@ getDataPromise.then(store => {
    //console.log('store in create_store', store);
    console.log('store accompanyingCourse', store.state.accompanying_course);
 
-   const i18n = createI18n({
-      datetimeFormats,
-      messages,
-      locale: 'fr',
-      fallbackLocale: 'fr'
-   });
+   const i18n = _createI18n(appMessages);
   
    const app = createApp({
       template: `<app></app>`,
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 89ae2607f..045476686 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -1,33 +1,32 @@
-import { datetimeFormats, personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
 
-const messages = {
+const appMessages = {
    fr: {
-      title: {
-         course: "Parcours",
-         persons_associated: "Usagers concernés",
-         requestor: "Demandeur",
-      },
       course: {
          id: "id",
+         title: "Parcours",
          opening_date: "Date d'ouverture",
          closing_date: "Date de clôture",
          remark: "Commentaire",
          closing_motive: "Motif de clôture",
       },
       persons_associated: {
+         title: "Usagers concernés",
          counter: "Pas d'usager | 1 usager | {count} usagers",
          firstname: "Prénom", 
          lastname: "Nom", 
          startdate: "Date d'entrée", 
          enddate: "Date de sortie",
          addPerson: "Ajouter un usager",
-      }
+      },
+      requestor: {
+         title: "Demandeur",
+      },
    }
 };
 
-Object.assign(messages.fr, personMessages.fr);
+Object.assign(appMessages.fr, personMessages.fr);
 
 export {
-   datetimeFormats,
-   messages
+   appMessages
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
index a2f112e97..270d0bd2a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
@@ -1,43 +1,12 @@
-const datetimeFormats = {
-   fr: {
-      short: {
-         year: "numeric",
-         month: "numeric",
-         day: "numeric"
-      },
-      long: {
-         year: "numeric",
-         month: "short",
-         day: "numeric",
-         weekday: "short",
-         hour: "numeric",
-         minute: "numeric",
-         hour12: false
-      }
-   }
-};
 const personMessages = {
    fr: {
-      action: {
-         actions: "Actions",
-         show: "Voir",
-         edit: "Modifier",
-         create: "Créer",
-         remove: "Enlever",
-         delete: "Supprimer",
-         save: "Enregistrer",
-         showModal: "Ouvrir une modale",
-         ok: "OK",
-         cancel: "Annuler",
-         close: "Fermer",
-         next: "Suivant",
-         previous: "Précédent",
-         back: "Retour"
+      add_persons: {
+         search_add_others_persons: "Rechercher et ajouter d'autres usagers",
+         title: "Ajouter des usagers",
       }
    }
-}
+};
 
 export {
-   datetimeFormats,
    personMessages
 };