From f8e309e42414cc04058fda64af27ef733faaf08c Mon Sep 17 00:00:00 2001
From: Elia Bieri <elia.bieri@iterativ.ch>
Date: Fri, 26 May 2023 10:25:49 +0200
Subject: [PATCH] Fix language switching

---
 client/src/main.ts                                   |  6 +-----
 .../attendanceCourse/AttendanceCourse.vue            |  4 +---
 client/src/stores/user.ts                            | 12 ++++++++++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/src/main.ts b/client/src/main.ts
index 621bc22d..df15ebee 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -1,6 +1,4 @@
 import * as Sentry from "@sentry/vue";
-import dayjs from "dayjs";
-import "dayjs/locale/de";
 import * as log from "loglevel";
 import { createPinia } from "pinia";
 import { createApp, markRaw } from "vue";
@@ -39,10 +37,8 @@ Sentry.init({
 });
 
 // todo: define lang setup
-const locale = "de";
-loadLocaleMessages(locale).then(() => {
+loadLocaleMessages("de").then(() => {
   app.use(router);
-  dayjs.locale(locale);
 
   const pinia = createPinia();
   pinia.use(({ store }) => {
diff --git a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
index 615ccc80..2373d00e 100644
--- a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
+++ b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
@@ -19,7 +19,6 @@
 <script setup lang="ts">
 import type { CourseSessionAttendanceCourse } from "@/types";
 import dayjs from "dayjs";
-import "dayjs/locale/de";
 import LocalizedFormat from "dayjs/plugin/localizedFormat";
 import { computed } from "vue";
 
@@ -30,8 +29,7 @@ export interface Props {
 const props = defineProps<Props>();
 
 dayjs.extend(LocalizedFormat);
-dayjs.locale("de");
-const format = "LLLL [Uhr]";
+const format = "LLLL";
 const start = computed(() => dayjs(props.attendanceCourse.start).format(format));
 const end = computed(() => dayjs(props.attendanceCourse.end).format(format));
 const location = computed(() => props.attendanceCourse.location);
diff --git a/client/src/stores/user.ts b/client/src/stores/user.ts
index 35c71172..e2403c9b 100644
--- a/client/src/stores/user.ts
+++ b/client/src/stores/user.ts
@@ -2,6 +2,7 @@ import log from "loglevel";
 
 import { bustItGetCache, itGetCached, itPost } from "@/fetchHelpers";
 import { loadLocaleMessages, setI18nLanguage } from "@/i18n";
+import dayjs from "dayjs";
 import { defineStore } from "pinia";
 
 const logoutRedirectUrl = import.meta.env.VITE_LOGOUT_REDIRECT || "/";
@@ -36,6 +37,17 @@ const initialUserState: UserState = {
 };
 
 async function setLocale(language: AvailableLanguages) {
+  switch (language) {
+    case "de":
+      await import("dayjs/locale/de");
+      break;
+    case "fr":
+      await import("dayjs/locale/fr");
+      break;
+    case "it":
+      await import("dayjs/locale/it");
+  }
+  dayjs.locale(language);
   await loadLocaleMessages(language);
   setI18nLanguage(language);
 }