Merged develop into feature/VBV-424-vv-content

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 { usePreferredLanguages } from "@vueuse/core";
 import dayjs from "dayjs";
 import { defineStore } from "pinia";
 
@@ -31,6 +32,22 @@ export type UserState = {
   language: AvailableLanguages;
 };
 
+const languages = usePreferredLanguages();
+
+const isAvailableLanguage = (language: string): language is AvailableLanguages => {
+  return language in AVAILABLE_LANGUAGES;
+};
+
+let defaultLanguage: AvailableLanguages = "de";
+const AVAILABLE_LANGUAGES = ["de", "fr", "it"];
+
+for (const language of languages.value) {
+  if (isAvailableLanguage(language)) {
+    defaultLanguage = language;
+    break;
+  }
+}
+
 const initialUserState: UserState = {
   id: 0,
   email: "",
@@ -41,7 +58,7 @@ const initialUserState: UserState = {
   is_superuser: false,
   course_session_experts: [],
   loggedIn: false,
-  language: "de",
+  language: defaultLanguage,
 };
 
 async function setLocale(language: AvailableLanguages) {

server/vbv_lernwelt/importer/tests/test_import_students.py

@@ -31,7 +31,7 @@ class ImportStudentsTestCase(TestCase):
             print(row)
             create_or_update_student(self.course, dict(row))
 
-        self.assertEqual(CourseSessionUser.objects.count(), 28)
+        self.assertEqual(CourseSessionUser.objects.count(), 14)
 
 
 class CreateOrUpdateStudentTestCase(TestCase):

server/vbv_lernwelt/importer/tests/test_import_trainers.py

@@ -38,7 +38,7 @@ class ImportTrainerTestCase(TestCase):
             print(row)
             create_or_update_trainer(self.course, dict(row))
 
-        self.assertEqual(CourseSessionUser.objects.count(), 4)
+        self.assertEqual(CourseSessionUser.objects.count(), 6)
 
 
 class CreateOrUpdateTrainerTestCase(TestCase):