From 8eb949af601ede4aed7c22ef00598ae7ef8a7d7b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 27 Jan 2023 16:01:26 +0100 Subject: [PATCH] Fix dynamic import of datefns with downcase locale Closes #1215 Signed-off-by: Thomas Citharel --- js/src/plugins/dateFns.ts | 3 +-- js/src/views/Event/EditView.vue | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/js/src/plugins/dateFns.ts b/js/src/plugins/dateFns.ts index 545428f0b..0a88a9e3e 100644 --- a/js/src/plugins/dateFns.ts +++ b/js/src/plugins/dateFns.ts @@ -5,10 +5,9 @@ export const dateFnsPlugin = { install(app: App, options: { locale: string }) { function dateFnsfileForLanguage(lang: string) { const matches: Record = { - en_US: "en-US", en: "en-US", }; - return matches[lang] ?? lang; + return matches[lang] ?? lang.replace("_", "-"); } import( diff --git a/js/src/views/Event/EditView.vue b/js/src/views/Event/EditView.vue index ddb78ce9a..d917583fa 100644 --- a/js/src/views/Event/EditView.vue +++ b/js/src/views/Event/EditView.vue @@ -70,7 +70,7 @@ class="datepicker starts-on" :placeholder="t('Type or select a date…')" icon="calendar-today" - :locale="$i18n.locale" + :locale="$i18n.locale.replace('_', '-')" v-model="beginsOn" horizontal-time-picker editable @@ -90,7 +90,7 @@ class="datepicker ends-on" :placeholder="t('Type or select a date…')" icon="calendar-today" - :locale="$i18n.locale" + :locale="$i18n.locale.replace('_', '-')" v-model="endsOn" horizontal-time-picker :min-datetime="beginsOn"