Merge branch 'master' into ticket-app-master

# Conflicts:
#	.eslint-baseline.json
#	src/Bundle/ChillMainBundle/Entity/User.php
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
#	src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -2,7 +2,7 @@
   <div v-if="!onlyButton" class="mt-4 flex-grow-1">
     <div class="loading">
       <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
-      <span class="sr-only">{{ $t("loading") }}</span>
+      <span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
     </div>
 
     <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
@@ -10,8 +10,10 @@
     </div>
 
     <div v-if="flag.success" class="alert alert-success">
-      {{ $t(getSuccessText) }}
-      <span v-if="forceRedirect">{{ $t("wait_redirection") }}</span>
+      {{ trans(getSuccessText) }}
+      <span v-if="forceRedirect">{{
+                trans(ADDRESS_WAIT_REDIRECTION)
+            }}</span>
     </div>
 
     <div
@@ -25,7 +27,7 @@
       <div class="no-address-yet">
         <i class="fa fa-map-marker" aria-hidden="true" />
         <p class="chill-no-data-statement">
-          {{ $t("not_yet_address") }}
+          {{ trans(ADDRESS_NOT_YET_ADDRESS) }}
         </p>
 
         <action-buttons
@@ -40,9 +42,9 @@
               :class="getClassButton"
               type="button"
               name="button"
-              :title="$t(getTextButton)"
+              :title="trans(getTextButton)"
             >
-              <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+              <span v-if="displayTextButton">{{ trans(getTextButton) }}</span>
             </button>
           </template>
         </action-buttons>
@@ -64,9 +66,9 @@
             :class="getClassButton"
             type="button"
             name="button"
-            :title="$t(getTextButton)"
+            :title="trans(getTextButton)"
           >
-            <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+            <span v-if="displayTextButton">{{ trans(getTextButton) }}</span>
           </button>
         </template>
       </action-buttons>
@@ -86,9 +88,9 @@
           :class="getClassButton"
           type="button"
           name="button"
-          :title="$t(getTextButton)"
+          :title="trans(getTextButton)"
         >
-          <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+          <span v-if="displayTextButton">{{ trans(getTextButton) }}</span>
         </button>
       </template>
     </action-buttons>
@@ -98,14 +100,35 @@
 <script>
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import ActionButtons from "./ActionButtons.vue";
+import {
+    ACTIVITY_CREATE_ADDRESS,
+    ACTIVITY_EDIT_ADDRESS,
+    ADDRESS_NOT_YET_ADDRESS,
+    ADDRESS_WAIT_REDIRECTION,
+    ADDRESS_LOADING,
+    ADDRESS_ADDRESS_EDIT_SUCCESS,
+    ADDRESS_ADDRESS_NEW_SUCCESS,
+    trans,
+} from "translator";
 
 export default {
   name: "ShowPane",
-  components: {
+  methods: {},components: {
     AddressRenderBox,
     ActionButtons,
   },
-  props: [
+  setup() {
+        return {
+            trans,
+            ACTIVITY_CREATE_ADDRESS,
+            ACTIVITY_EDIT_ADDRESS,
+            ADDRESS_NOT_YET_ADDRESS,
+            ADDRESS_WAIT_REDIRECTION,
+            ADDRESS_LOADING,
+            ADDRESS_ADDRESS_NEW_SUCCESS,
+            ADDRESS_ADDRESS_EDIT_SUCCESS,
+        };
+    },props: [
     "context",
     "defaultz",
     "options",
@@ -145,16 +168,18 @@ export default {
         (this.options.button.text.edit !== null ||
           this.options.button.text.create !== null)
       ) {
-        return this.context.edit
-          ? this.options.button.text.edit
-          : this.options.button.text.create;
-      }
+        // console.log('this.options.button.text', this.options.button.text)
+                return this.context.edit
+      ? ACTIVITY_CREATE_ADDRESS
+                    : ACTIVITY_EDIT_ADDRESS;
+            }
+            console.log("defaultz", this.defaultz);
       return this.context.edit
         ? this.defaultz.button.text.edit
         : this.defaultz.button.text.create;
     },
     getSuccessText() {
-      return this.context.edit ? "address_edit_success" : "address_new_success";
+      return this.context.edit ? ADDRESS_ADDRESS_EDIT_SUCCESS : ADDRESS_ADDRESS_NEW_SUCCESS;
     },
     onlyButton() {
       return typeof this.options.onlyButton !== "undefined"