diff --git a/src/tests/unit/views/UploadPicturesView.spec.js b/src/tests/unit/views/UploadPicturesView.spec.js index ad8df0c..932d048 100644 --- a/src/tests/unit/views/UploadPicturesView.spec.js +++ b/src/tests/unit/views/UploadPicturesView.spec.js @@ -103,7 +103,7 @@ describe('Template', () => { spyPicture.mockReturnValue({ data: {} }) const sequenceTitle = `Séquence du ${formatDate( new Date(), - 'Do MMMM YYYY, hh:mm:ss' + 'Do MMMM YYYY, HH:mm:ss' )}` const body = new FormData() body.append('position', '1') diff --git a/src/utils/dates.ts b/src/utils/dates.ts index 666406c..c9700bf 100644 --- a/src/utils/dates.ts +++ b/src/utils/dates.ts @@ -3,7 +3,7 @@ import 'moment/dist/locale/fr' function formatDate(date: Date, formatType: string): string { const formatDate = moment(date) - return formatDate.locale('fr').format(formatType) + return formatDate.locale(window.navigator.language).format(formatType) } function durationCalc(duration1: Date, duration2: Date, type: string): number { diff --git a/src/views/MySequenceView.vue b/src/views/MySequenceView.vue index c5d2102..779052c 100644 --- a/src/views/MySequenceView.vue +++ b/src/views/MySequenceView.vue @@ -62,7 +62,9 @@