From 4b749fb53cad8f8fd994b01b9d9ed690d4e5ad33 Mon Sep 17 00:00:00 2001
From: Julian Raufelder <Julian@Raufelder.com>
Date: Fri, 7 Feb 2025 17:45:45 +0100
Subject: [PATCH] Apply further suggestion from code review

Co-authored-by: iammajid <majid.achhoud@gmail.com>
---
 frontend/src/router/index.ts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index e871aa14b..76169c304 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -178,17 +178,11 @@ router.beforeEach((to, from, next) => {
 
 // THIRD check user/browser keys (requires auth)
 router.beforeEach(async (to) => {
-  let me = undefined;
-  if (!to.meta.skipAuth) {
-    me = await userdata.me;
-    if (me.language) {
-      i18n.global.locale.value = mapToLocale(me.language);
-    }
-  }
   if (to.meta.skipSetup) {
     return;
   }
-  if (!me?.setupCode) {
+  const me = await userdata.me;
+  if (!me.setupCode) {
     return { path: '/app/setup' };
   }
   const browserKeys = await userdata.browserKeys;
@@ -201,4 +195,14 @@ router.beforeEach(async (to) => {
   }
 });
 
+// FOURTH apply user language
+router.beforeEach(async (to) => {
+  if (!to.meta.skipAuth) {
+    const me = await userdata.me;
+    if (me.language) {
+      i18n.global.locale.value = mapToLocale(me.language);
+    }
+  }
+});
+
 export default router;