diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 3357bffa9..fba5a2781 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -23,5 +23,3 @@ export default { ]) }; - - 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 9cfa8f10d..89ae2607f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -1,6 +1,5 @@ -import { datetimeFormats } from 'ChillPersonAssets/vuejs/_js/i18n' +import { datetimeFormats, personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' -// TODO howto merge message object from import ?? const messages = { fr: { title: { @@ -22,26 +21,12 @@ const messages = { startdate: "Date d'entrée", enddate: "Date de sortie", addPerson: "Ajouter un usager", - }, - 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" } } }; +Object.assign(messages.fr, personMessages.fr); + export { datetimeFormats, messages diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js index 5a675159e..a2f112e97 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js @@ -16,9 +16,28 @@ const datetimeFormats = { } } }; -// const messages = {} ... +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" + } + } +} export { datetimeFormats, - // messages + personMessages };