mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
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:
commit
d27bdf68fb
@ -1,6 +1,6 @@
|
|||||||
import { createApp } from 'vue'
|
import { createApp } from 'vue'
|
||||||
import { createI18n } from 'vue-i18n'
|
import { createI18n } from 'vue-i18n'
|
||||||
import { datetimeFormats, messages } from '../_components/i18n.js'
|
import { datetimeFormats, messages } from './js/i18n'
|
||||||
import createStore from './store'
|
import createStore from './store'
|
||||||
|
|
||||||
import App from './App.vue';
|
import App from './App.vue';
|
@ -1,21 +1,6 @@
|
|||||||
const datetimeFormats = {
|
import { datetimeFormats } from 'ChillPersonAssets/vuejs/_js/i18n'
|
||||||
fr: {
|
|
||||||
short: {
|
// TODO howto merge message object from import ??
|
||||||
year: "numeric",
|
|
||||||
month: "numeric",
|
|
||||||
day: "numeric"
|
|
||||||
},
|
|
||||||
long: {
|
|
||||||
year: "numeric",
|
|
||||||
month: "short",
|
|
||||||
day: "numeric",
|
|
||||||
weekday: "short",
|
|
||||||
hour: "numeric",
|
|
||||||
minute: "numeric",
|
|
||||||
hour12: false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const messages = {
|
const messages = {
|
||||||
fr: {
|
fr: {
|
||||||
title: {
|
title: {
|
||||||
@ -37,19 +22,17 @@ const messages = {
|
|||||||
startdate: "Date d'entrée",
|
startdate: "Date d'entrée",
|
||||||
enddate: "Date de sortie",
|
enddate: "Date de sortie",
|
||||||
addPerson: "Ajouter un usager",
|
addPerson: "Ajouter un usager",
|
||||||
|
|
||||||
},
|
},
|
||||||
action: {
|
action: {
|
||||||
actions: "Actions",
|
actions: "Actions",
|
||||||
show: "Voir",
|
show: "Voir",
|
||||||
edit: "Modifier",
|
edit: "Modifier",
|
||||||
create: "Créer",
|
create: "Créer",
|
||||||
remove: "Enlever",
|
remove: "Enlever",
|
||||||
delete: "Supprimer",
|
delete: "Supprimer",
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
datetimeFormats,
|
datetimeFormats,
|
@ -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
|
||||||
|
};
|
@ -8,5 +8,5 @@ module.exports = function(encore, entries)
|
|||||||
ChillPersonAssets: __dirname + '/Resources/public'
|
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');
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user