From 7c2422743e6aea640bb44ae2bdcaa785efad4b11 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 12:22:12 +0200 Subject: [PATCH] Address: remove unused translations specific to household or person context --- .../vuejs/Address/components/ShowPane.vue | 11 +--------- .../Resources/public/vuejs/Address/i18n.js | 9 -------- .../public/vuejs/HouseholdAddress/js/i18n.js | 21 ------------------- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue index 99b531d97..c5a9d0510 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue @@ -78,16 +78,7 @@ export default { return (this.context.edit) ? this.defaultz.button.text.edit : this.defaultz.button.text.create; }, getSuccessText() { - switch (this.context.target.name) { - /* - case 'household': - return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success'; - case 'person': - return (this.context.edit) ? 'person_address_edit_success' : 'person_address_creation_success'; - */ - default: - return (this.context.edit) ? 'address_edit_success' : 'address_new_success'; - } + return (this.context.edit) ? 'address_edit_success' : 'address_new_success'; }, hideAddress() { return (typeof this.options.hideAddress !== 'undefined') ? diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js index cc7a5ef79..2a2fc28ce 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js @@ -39,17 +39,8 @@ const addressMessages = { not_yet_address: "Il n'y a pas encore d'adresse. Cliquez sur '+ Créer une adresse'", use_this_address: "Utiliser cette adresse", - // person specific - add_an_address_to_person: 'Ajouter l\'adresse à la personne', - person_address_creation_success: 'La nouvelle adresse de la personne est enregistrée', - person_address_edit_success: 'L\'adresse de la personne a été mise à jour', - // household specific move_date: 'Date du déménagement', - select_a_existing_address: 'Sélectionner une adresse existante', - add_an_address_to_household: 'Enregistrer', - household_address_move_success: 'La nouvelle adresse du ménage est enregistrée', - household_address_edit_success: 'L\'adresse du ménage a été mise à jour', } }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js deleted file mode 100644 index d62e9add9..000000000 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/js/i18n.js +++ /dev/null @@ -1,21 +0,0 @@ -import { addressMessages } from 'ChillMainAssets/vuejs/Address/i18n' - -const appMessages = { - fr: { - select_a_existing_address: 'Sélectionner une adresse existante', - create_a_new_address: 'Créer une nouvelle adresse', - add_an_address_to_household: 'Enregistrer', - validFrom: 'Date du déménagement', - move_date: 'Date du déménagement', - back_to_the_list: 'Retour à la liste', - household_address_move_success: 'La nouvelle adresse du ménage est enregistrée', - household_address_edit_success: 'L\'adresse du ménage a été mise à jour', - loading: 'chargement en cours...' - } -}; - -Object.assign(appMessages.fr, addressMessages.fr); - -export { - appMessages -};