From ad5f95fcbf2cb7beb1cad0d95a91dfd48b18ef14 Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Mon, 20 Jan 2025 18:26:04 +0100
Subject: [PATCH] fixes default language after signup

---
 web/src/lib/models/api/settings_schema.ts     |  4 +--
 web/src/lib/models/settings.ts                | 17 +++++++--
 web/src/routes/register/+page.svelte          | 35 ++++++++++++++-----
 web/src/routes/settings/language/+page.svelte |  3 +-
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/web/src/lib/models/api/settings_schema.ts b/web/src/lib/models/api/settings_schema.ts
index f37d51a9..cf6eb2b6 100644
--- a/web/src/lib/models/api/settings_schema.ts
+++ b/web/src/lib/models/api/settings_schema.ts
@@ -1,10 +1,10 @@
 import { z, ZodType } from "zod";
 import { NotificationType } from "../notification";
-import type { Settings } from "../settings";
+import { Language, type Settings } from "../settings";
 
 const SettingsCreateSchema = z.object({
     unit: z.enum(["metric", "imperial"]).optional(),
-    language: z.enum(["en", "de", "es", "fr", "hu", "it", "nl", "pl", "pt", "zh"]).optional(),
+    language: z.enum(Object.values(Language) as [Language, ...Language[]]).optional(),
     bio: z.string().optional(),
     mapFocus: z.enum(["trails", "location"]).optional(),
     location: z.object({
diff --git a/web/src/lib/models/settings.ts b/web/src/lib/models/settings.ts
index d0061a12..e334c82b 100644
--- a/web/src/lib/models/settings.ts
+++ b/web/src/lib/models/settings.ts
@@ -1,9 +1,22 @@
 import type { NotificationType } from "./notification";
 
+export enum Language {
+  en = "en",
+  de = "de",
+  es = "es",
+  fr = "fr",
+  hu = "hu",
+  it = "it",
+  nl = "nl",
+  pl = "pl",
+  pt = "pt",
+  zh = "zh"
+}
+
 class Settings {
   id?: string;
   unit?: "metric" | "imperial";
-  language?: "en" | "de" | "es" | "fr" | "hu" | "it" | "nl" | "pl" | "pt" | "zh";
+  language?: Language;
   bio?: string;
   mapFocus?: "trails" | "location";
   location?: { name: string, lat: number, lon: number };
@@ -16,7 +29,7 @@ class Settings {
 
   constructor(
     unit: "metric" | "imperial",
-    language: "en" | "de" | "es" | "fr" | "hu" | "it" | "nl" | "pl" | "pt" | "zh",
+    language: Language,
     mapFocus: "trails" | "location",
     user: string,
     params?: {
diff --git a/web/src/routes/register/+page.svelte b/web/src/routes/register/+page.svelte
index bf9ea942..a2cdd13e 100644
--- a/web/src/routes/register/+page.svelte
+++ b/web/src/routes/register/+page.svelte
@@ -1,17 +1,20 @@
 <script lang="ts">
-    import { goto } from "$app/navigation";
+    import { goto, invalidateAll } from "$app/navigation";
+    import { page } from "$app/stores";
     import Button from "$lib/components/base/button.svelte";
     import TextField from "$lib/components/base/text_field.svelte";
     import LogoTextTwoLineDark from "$lib/components/logo/logo_text_two_line_dark.svelte";
     import LogoTextTwoLineLight from "$lib/components/logo/logo_text_two_line_light.svelte";
+    import { Language, type Settings } from "$lib/models/settings";
     import type { User } from "$lib/models/user";
+    import { settings_update } from "$lib/stores/settings_store";
     import { theme } from "$lib/stores/theme_store";
     import { show_toast } from "$lib/stores/toast_store";
     import { login, users_create } from "$lib/stores/user_store";
     import { validator } from "@felte/validator-zod";
     import { createForm } from "felte";
     import { _ } from "svelte-i18n";
-    import { z } from "zod";
+    import { INVALID, z } from "zod";
 
     let loading: boolean = false;
     const { form, errors } = createForm<User>({
@@ -23,12 +26,15 @@
         },
         extend: validator({
             schema: z.object({
-                username: z.string().min(
-                    3,
-                    $_("must-be-at-least-n-characters-long", {
-                        values: { n: 3 },
-                    }),
-                ).regex(/^[\w][\w\.]*$/, $_("invalid-username")),
+                username: z
+                    .string()
+                    .min(
+                        3,
+                        $_("must-be-at-least-n-characters-long", {
+                            values: { n: 3 },
+                        }),
+                    )
+                    .regex(/^[\w][\w\.]*$/, $_("invalid-username")),
                 email: z
                     .string()
                     .min(1, "required")
@@ -57,14 +63,25 @@
             }
             try {
                 await login(newUser);
-                goto(`/`);
             } catch (e) {
                 show_toast({
                     icon: "close",
                     type: "error",
                     text: $_("error-during-login"),
                 });
+            }
+            try {
+                await invalidateAll();
+                const language = Object.values(Language).includes(
+                    window.navigator.language as Language,
+                )
+                    ? (window.navigator.language as Language)
+                    : Language.en;
+                await settings_update({ id: $page.data.settings.id, language });
+            } catch (e) {
+                console.error(e);
             } finally {
+                window.location.href = "/";
                 loading = false;
             }
         },
diff --git a/web/src/routes/settings/language/+page.svelte b/web/src/routes/settings/language/+page.svelte
index c5684f41..c4cad047 100644
--- a/web/src/routes/settings/language/+page.svelte
+++ b/web/src/routes/settings/language/+page.svelte
@@ -6,6 +6,7 @@
     import Select, {
         type SelectItem,
     } from "$lib/components/base/select.svelte";
+    import type { Language } from "$lib/models/settings";
     import { settings_update } from "$lib/stores/settings_store";
     import { _, locale } from "svelte-i18n";
 
@@ -32,7 +33,7 @@
     let selectedLanguage = settings?.language ?? "en";
 
     async function handleLanguageSelection(
-        value: "en" | "de" | "fr" | "hu" | "nl" | "pl" | "pt",
+        value: Language,
     ) {
         await settings_update({
             id: settings!.id,