From 65ac9a47b47c50d6f8c0e91eef81e2e24cfb5f1f Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 27 May 2021 17:53:14 +0200 Subject: [PATCH] add addPersons subcomponent --- .../Resources/public/vuejs/Activity/App.vue | 44 +++++++++++++++++-- .../Resources/public/vuejs/Activity/i18n.js | 9 +++- .../Resources/views/Activity/edit.html.twig | 2 + .../Resources/views/Activity/new.html.twig | 2 + 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue index 74466733a..b78483bc5 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue @@ -1,16 +1,54 @@ diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js index b38767780..91699e320 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js @@ -1,8 +1,15 @@ +import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' + const appMessages = { fr: { - + activities: { + add_persons: "Ajouter des personnes" + } } } + +Object.assign(appMessages.fr, personMessages.fr); + export { appMessages }; diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig index 902278874..068ae2db7 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig @@ -37,6 +37,8 @@ {{ form_row(edit_form.users) }} {% endif %} +
+

{{ 'Activity data'|trans }}

{%- if edit_form.date is defined -%} diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig index 83d8a6c58..44897a331 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig @@ -38,6 +38,8 @@ {{ form_row(form.users) }} {% endif %} +
+

{{ 'Activity data'|trans }}

{%- if form.date is defined -%}