From 96e08fcbdb1034c78dc451512fcf0f4a51eea32c Mon Sep 17 00:00:00 2001
From: Xela <git@xela.zone>
Date: Tue, 21 Apr 2026 16:37:03 -0800
Subject: [PATCH] fix(frontend): respect week_start setting when language is
 not explicitly set

---
 frontend/src/helpers/useFlatpickrLanguage.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/helpers/useFlatpickrLanguage.ts b/frontend/src/helpers/useFlatpickrLanguage.ts
index ebbdfa55d..f0c033342 100644
--- a/frontend/src/helpers/useFlatpickrLanguage.ts
+++ b/frontend/src/helpers/useFlatpickrLanguage.ts
@@ -8,14 +8,15 @@ export function useFlatpickrLanguage() {
 	const authStore = useAuthStore()
 
 	return computed(() => {
+		let language = { ...FlatpickrLanguages.en }
 		const userLanguage = authStore.settings.language
-		if (!userLanguage) {
-			return { ...FlatpickrLanguages.en }
+		
+		if (userLanguage) {
+			const langPair = userLanguage.split('-')
+			const code = userLanguage === 'vi-VN' ? 'vn' : 'en'
+			language = { ...(FlatpickrLanguages?.[langPair?.[0] as key] || FlatpickrLanguages[code]) }
 		}
-
-		const langPair = userLanguage.split('-')
-		const code = userLanguage === 'vi-VN' ? 'vn' : 'en'
-		const language = { ...(FlatpickrLanguages?.[langPair?.[0] as key] || FlatpickrLanguages[code]) }
+		
 		language.firstDayOfWeek = authStore.settings.weekStart ?? language.firstDayOfWeek
 		return language
 	})