fix translations for AddPersons in PickEntity

This commit is contained in:
Mathieu Jaumotte 2022-01-10 12:41:47 +01:00
parent a40077e91b
commit 95027e93c6
4 changed files with 15 additions and 19 deletions

View File

@ -1,6 +1,9 @@
import { createApp } from 'vue';
import PickEntity from 'ChillMainAssets/vuejs/PickEntity/PickEntity.vue';
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
import { appMessages } from 'ChillMainAssets/vuejs/PickEntity/i18n';
const i18n = _createI18n(appMessages);
window.addEventListener('DOMContentLoaded', function(e) {
@ -11,8 +14,7 @@ window.addEventListener('DOMContentLoaded', function(e) {
const
isMultiple = parseInt(el.dataset.multiple) === 1,
input = document.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)],
i18n = _createI18n({});
picked = isMultiple ? JSON.parse(input.value) : [JSON.parse(input.value)];
createApp({
template: '<pick-entity ' +

View File

@ -9,8 +9,8 @@
<AddPersons
:options="addPersonsOptions"
:key="uniqid"
buttonTitle="pick_person.add"
modalTitle="translatedListOfTypes"
:buttonTitle="translatedListOfTypes"
:modalTitle="translatedListOfTypes"
ref="addPersons"
@addNewPersons="addNewEntity"
>
@ -21,13 +21,10 @@
<script>
import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
import messages from "./i18n";
console.log('messages', messages);
import { appMessages } from "./i18n";
export default {
name: "PickEntity",
messages,
props: {
multiple: {
type: Boolean,
@ -69,10 +66,9 @@ export default {
translatedListOfTypes() {
let trans = [];
this.types.forEach(t => {
trans.push(this.$t('pick_entity.'.t));
trans.push(appMessages.fr.pick_entity[t].toLowerCase());
})
return trans.join(', ');
return appMessages.fr.pick_entity.modal_title + trans.join(', ');
}
},
methods: {

View File

@ -1,10 +1,10 @@
import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n';
const messages = {
const appMessages = {
fr: {
pick_entity: {
add: 'Ajouter',
modal_title: 'Ajouter des',
modal_title: 'Ajouter des ',
user: 'Utilisateurs',
person: 'Usagers',
thirdparty: 'Tiers',
@ -12,6 +12,6 @@ const messages = {
}
}
const full = Object.assign(messages, personMessages);
Object.assign(appMessages.fr, personMessages.fr);
export default full;
export { appMessages };

View File

@ -93,11 +93,9 @@ import PersonSuggestion from './AddPersons/PersonSuggestion';
import { searchEntities } from 'ChillPersonAssets/vuejs/_api/AddPersons';
import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
import {messages} from 'ChillPersonAssets/vuejs/_js/i18n.js';
export default {
name: 'AddPersons',
messages,
components: {
Modal,
PersonSuggestion,