From c302452e01b20fd284b288350e07c5ee1261c617 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 12 Aug 2021 16:14:17 +0200
Subject: [PATCH] improve Address reusability: move i18n translations out of
 root component

---
 .../public/vuejs/Address/components/AddAddress.vue    | 11 ++++++++---
 .../Resources/public/vuejs/Address/index.js           |  4 ----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 13d3cc150..c3921a609 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -15,7 +15,7 @@
          @close="flag.showPane = false">
 
          <template v-slot:header>
-            <h2 class="modal-title">{{ getTextTitle }}
+            <h2 class="modal-title">{{ $t(getTextTitle) }}
                <span v-if="flag.loading" class="loading">
                   <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
                   <span class="sr-only">Loading...</span>
@@ -70,7 +70,7 @@
          @close="flag.editPane = false">
 
          <template v-slot:header>
-            <h2 class="modal-title">{{ getTextTitle }}
+            <h2 class="modal-title">{{ $t(getTextTitle) }}
                <span v-if="flag.loading" class="loading">
                   <i class="fa fa-circle-o-notch fa-spin fa-fw"></i>
                   <span class="sr-only">Loading...</span>
@@ -126,9 +126,14 @@ import { postAddressToHousehold } from "ChillPersonAssets/vuejs/_api/AddAddress/
 import ShowAddress from './ShowAddress.vue';
 import EditAddress from './EditAddress.vue';
 
+import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
+import { addressMessages } from '../i18n'
+const i18n = _createI18n(addressMessages);
+
 export default {
    name: "AddAddress",
    props: ['context', 'options', 'result'],
+   i18n,
    components: {
       Modal,
       ShowAddress,
@@ -211,7 +216,7 @@ export default {
             )) {
             return (this.context.edit) ? this.options.title.edit : this.options.title.create;
          }
-         return (this.context.edit) ? this.$t(this.default.title.edit) : this.$t(this.default.title.create);
+         return (this.context.edit) ? this.default.title.edit : this.default.title.create;
       },
       getTextButton() {
          if ( typeof this.options.button.text !== 'undefined'
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index c96c35a6c..c69991c0f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -2,10 +2,6 @@ import { createApp } from 'vue'
 import { store } from './store'
 import App from './App.vue';
 
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { addressMessages } from './i18n'
-const i18n = _createI18n(addressMessages);
-
 const app = createApp({
     template: `<app></app>`,
 })