Merge branch '_31_interface_creation_parcours' of https://gitlab.com/Chill-Projet/chill-bundles into _31_interface_creation_parcours

merge..
This commit is contained in:
nobohan 2021-04-28 12:24:29 +02:00
commit d27bdf68fb
11 changed files with 31 additions and 24 deletions

View File

@ -1,6 +1,6 @@
import { createApp } from 'vue'
import { createI18n } from 'vue-i18n'
import { datetimeFormats, messages } from '../_components/i18n.js'
import { datetimeFormats, messages } from './js/i18n'
import createStore from './store'
import App from './App.vue';

View File

@ -1,21 +1,6 @@
const datetimeFormats = {
fr: {
short: {
year: "numeric",
month: "numeric",
day: "numeric"
},
long: {
year: "numeric",
month: "short",
day: "numeric",
weekday: "short",
hour: "numeric",
minute: "numeric",
hour12: false
}
}
}
import { datetimeFormats } from 'ChillPersonAssets/vuejs/_js/i18n'
// TODO howto merge message object from import ??
const messages = {
fr: {
title: {
@ -37,19 +22,17 @@ const messages = {
startdate: "Date d'entrée",
enddate: "Date de sortie",
addPerson: "Ajouter un usager",
},
action: {
actions: "Actions",
actions: "Actions",
show: "Voir",
edit: "Modifier",
create: "Créer",
remove: "Enlever",
delete: "Supprimer",
}
}
}
};
export {
datetimeFormats,

View File

@ -0,0 +1,24 @@
const datetimeFormats = {
fr: {
short: {
year: "numeric",
month: "numeric",
day: "numeric"
},
long: {
year: "numeric",
month: "short",
day: "numeric",
weekday: "short",
hour: "numeric",
minute: "numeric",
hour12: false
}
}
};
// const messages = {} ...
export {
datetimeFormats,
// messages
};

View File

@ -8,5 +8,5 @@ module.exports = function(encore, entries)
ChillPersonAssets: __dirname + '/Resources/public'
});
encore.addEntry('accompanying_course', __dirname + '/Resources/public/js/AccompanyingCourse/index.js');
encore.addEntry('accompanying_course', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
};