diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d726e1b..c24f76df4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,8 @@ and this project adheres to ## Unreleased +* vuejs: translate in French all multiselect widgets * [address] define address lines according postal standards for France and Belgium (default) and change AddressRender, chill_entity_render_box and AddressRenderBox.vue - * [household] change translations (champs-libres/departement-de-la-vendee/accent-suivi-developpement#109) * [household] add address i18n in household component (champs-libres/departement-de-la-vendee/accent-suivi-developpement#158) * [household] add on the fly i18n in household component @@ -25,7 +25,6 @@ and this project adheres to * [accompanyingCourse] Add a delete action and delete buttons to delete a accompanying course when step = DRAFT (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/64) * [accompanyingCourse] Add a administrative location in the accompanying course, set the user current location as default, allow to select a location in a select field and do not allow to confirm the accompanying course if location is empty. * [accompanyingCourse] Add the administrative location in the available variables for document generation - * AddAddress: optimize loading: wait for the user finish typing; * UserPicker: fix bug with deprecated role * docgen: add base context + tests diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue index 49b53c8cb..f5057eb25 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue @@ -12,7 +12,7 @@
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue index 50eb14799..b8249ccc5 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue @@ -15,13 +15,15 @@ :searchable="true" :placeholder="$t('activity.choose_location')" :custom-label="customLabel" + :select-label="$t('multiselect.select_label')" + :deselect-label="$t('multiselect.deselect_label')" + :selected-label="$t('multiselect.selected_label')" :options="availableLocations" group-values="locations" group-label="locationGroup" v-model="location" > -
@@ -32,7 +34,6 @@ import { mapState, mapGetters } from "vuex"; import VueMultiselect from "vue-multiselect"; import NewLocation from "./Location/NewLocation.vue"; -import { getLocations, getLocationTypeByDefaultFor, getUserCurrentLocation } from "../api.js"; export default { name: "Location", diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue index 92aa7be0e..e585200c0 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue @@ -9,9 +9,9 @@ @@ -21,18 +21,18 @@ label="text" track-by="id" open-direction="bottom" - v-bind:close-on-select="true" - v-bind:preserve-search="false" - v-bind:reset-after="true" - v-bind:hide-selected="true" - v-bind:taggable="false" - v-bind:multiple="false" - v-bind:searchable="true" - v-bind:allow-empty="true" - v-bind:show-labels="false" - v-bind:loading="issueIsLoading" - v-bind:placeholder="$t('activity.choose_other_social_issue')" - v-bind:options="socialIssuesOther" + :close-on-select="true" + :preserve-search="false" + :reset-after="true" + :hide-selected="true" + :taggable="false" + :multiple="false" + :searchable="true" + :allow-empty="true" + :show-labels="false" + :loading="issueIsLoading" + :placeholder="$t('activity.choose_other_social_issue')" + :options="socialIssuesOther" @select="addIssueInList"> @@ -58,9 +58,9 @@ diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js index fa7da3203..509e3b0d9 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js @@ -1,4 +1,5 @@ import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n' +import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n' const activityMessages = { fr: { @@ -33,12 +34,11 @@ const activityMessages = { }, create_address: 'Créer une adresse', edit_address: "Modifier l'adresse" - } } } -Object.assign(activityMessages.fr, personMessages.fr); +Object.assign(activityMessages.fr, personMessages.fr, multiSelectMessages.fr); export { activityMessages diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue index da9a9eaf8..494fde96c 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue @@ -13,6 +13,9 @@ :close-on-select="false" :allow-empty="true" :model-value="value" + :select-label="$t('multiselect.select_label')" + :deselect-label="$t('multiselect.deselect_label')" + :selected-label="$t('multiselect.selected_label')" @select="selectUsers" @remove="unSelectUsers" @close="coloriseSelectedValues" diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js index f1aae5df1..2f7d15662 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js +++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/js/i18n.js @@ -1,13 +1,17 @@ +import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n' + const calendarUserSelectorMessages = { - fr: { - choose_your_calendar_user: "Afficher les plages de disponibilités", - select_user: "Sélectionnez des calendriers", - show_my_calendar: "Afficher mon calendrier", - show_weekends: "Afficher les week-ends" - } - }; + fr: { + choose_your_calendar_user: "Afficher les plages de disponibilités", + select_user: "Sélectionnez des calendriers", + show_my_calendar: "Afficher mon calendrier", + show_weekends: "Afficher les week-ends" + } +}; - export { - calendarUserSelectorMessages - }; +Object.assign(calendarUserSelectorMessages.fr, multiSelectMessages.fr); + +export { + calendarUserSelectorMessages +}; \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue index c333961db..6d9c32524 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue @@ -6,8 +6,9 @@ v-model="value" :placeholder="$t('select_address')" :tag-placeholder="$t('create_address')" - :select-label="$t('press_enter_to_select')" + :select-label="$t('multiselect.select_label')" :deselect-label="$t('create_address')" + :selected-label="$t('multiselect.selected_label')" @search-change="listenInputSearch" ref="addressSelector" @select="selectAddress" diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue index abd1cd8de..5191b3a31 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue @@ -12,8 +12,9 @@ label="value" :custom-label="transName" :placeholder="$t('select_city')" - :select-label="$t('press_enter_to_select')" + :select-label="$t('multiselect.select_label')" :deselect-label="$t('create_postal_code')" + :selected-label="$t('multiselect.selected_label')" :taggable="true" :multiple="false" @tag="addPostcode" diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue index c15db8d2a..c1b1d1b55 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue @@ -5,12 +5,13 @@ id="countrySelect" label="name" track-by="id" - v-bind:custom-label="transName" - v-bind:placeholder="$t('select_country')" - v-bind:options="sortedCountries" + :custom-label="transName" + :placeholder="$t('select_country')" + :options="sortedCountries" v-model="value" - :select-label="$t('press_enter_to_select')" - :deselect-label="$t('press_enter_to_remove')" + :select-label="$t('multiselect.select_label')" + :deselect-label="$t('multiselect.deselect_label')" + :selected-label="$t('multiselect.selected_label')" @select="selectCountry"> diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue index 15c77e414..798835a76 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue @@ -10,7 +10,7 @@

{{ $t('address_suggestions') }}

-
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js index ab0032de6..98f31cbd3 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/i18n.js @@ -1,7 +1,7 @@ +import { multiSelectMessages } from 'ChillMainAssets/vuejs/_js/i18n' + const addressMessages = { fr: { - press_enter_to_select: 'Appuyer sur Entrée pour sélectionner', - press_enter_to_remove: 'Appuyer sur Entrée pour désélectionner', add_an_address_title: 'Créer une adresse', edit_an_address_title: 'Modifier une adresse', create_a_new_address: 'Créer une nouvelle adresse', @@ -48,6 +48,8 @@ const addressMessages = { } }; +Object.assign(addressMessages.fr, multiSelectMessages.fr); + export { addressMessages }; diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js index 4b998f98a..1ab8eb29a 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js @@ -84,3 +84,17 @@ const _createI18n = (appMessages) => { }; export { _createI18n } + +export const multiSelectMessages = { + fr: { + multiselect: { + placeholder: 'Choisir', + tag_placeholder: 'Créer un nouvel élément', + select_label: 'Appuyer sur "Entrée" pour sélectionner', + deselect_label: 'Appuyer sur "Entrée" pour désélectionner', + select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe', + deselect_group_label: 'Appuyer sur "Entrée" pour désélectionner ce groupe', + selected_label: 'Sélectionné' + } + } +}; \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue index 00dc73bd2..435dfe0c8 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue @@ -1,9 +1,9 @@