From 4add8abaa18722266ff9fb23147ec58d38debff4 Mon Sep 17 00:00:00 2001
From: Xela <git@xela.zone>
Date: Tue, 21 Apr 2026 01:30:53 +0000
Subject: [PATCH] feat(user): support all weekdays as week start

---
 frontend/src/helpers/useFlatpickrLanguage.ts | 4 ++--
 frontend/src/i18n/lang/en.json               | 5 +++++
 frontend/src/views/user/settings/General.vue | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frontend/src/helpers/useFlatpickrLanguage.ts b/frontend/src/helpers/useFlatpickrLanguage.ts
index 9458678c3..ebbdfa55d 100644
--- a/frontend/src/helpers/useFlatpickrLanguage.ts
+++ b/frontend/src/helpers/useFlatpickrLanguage.ts
@@ -10,12 +10,12 @@ export function useFlatpickrLanguage() {
 	return computed(() => {
 		const userLanguage = authStore.settings.language
 		if (!userLanguage) {
-			return FlatpickrLanguages.en
+			return { ...FlatpickrLanguages.en }
 		}
 
 		const langPair = userLanguage.split('-')
 		const code = userLanguage === 'vi-VN' ? 'vn' : 'en'
-		const language = FlatpickrLanguages?.[langPair?.[0] as key] || FlatpickrLanguages[code]
+		const language = { ...(FlatpickrLanguages?.[langPair?.[0] as key] || FlatpickrLanguages[code]) }
 		language.firstDayOfWeek = authStore.settings.weekStart ?? language.firstDayOfWeek
 		return language
 	})
diff --git a/frontend/src/i18n/lang/en.json b/frontend/src/i18n/lang/en.json
index da95adc8b..3b8eab1a6 100644
--- a/frontend/src/i18n/lang/en.json
+++ b/frontend/src/i18n/lang/en.json
@@ -132,6 +132,11 @@
         "weekStart": "Week starts on",
         "weekStartSunday": "Sunday",
         "weekStartMonday": "Monday",
+        "weekStartTuesday": "Tuesday",
+        "weekStartWednesday": "Wednesday",
+        "weekStartThursday": "Thursday",
+        "weekStartFriday": "Friday",
+        "weekStartSaturday": "Saturday",
         "language": "Language",
         "defaultProject": "Default project",
         "defaultView": "Default view",
diff --git a/frontend/src/views/user/settings/General.vue b/frontend/src/views/user/settings/General.vue
index c1a68a888..1d80c46ac 100644
--- a/frontend/src/views/user/settings/General.vue
+++ b/frontend/src/views/user/settings/General.vue
@@ -128,6 +128,7 @@
 			>
 				<FormSelect
 					v-model.number="settings.weekStart"
+					v-cy="'weekStartSelect'"
 					:options="weekStartOptions"
 				/>
 			</FormField>
@@ -344,6 +345,11 @@ const minimumPriorityOptions = computed(() => [
 const weekStartOptions = computed(() => [
 	{value: 0, label: t('user.settings.general.weekStartSunday')},
 	{value: 1, label: t('user.settings.general.weekStartMonday')},
+	{value: 2, label: t('user.settings.general.weekStartTuesday')},
+	{value: 3, label: t('user.settings.general.weekStartWednesday')},
+	{value: 4, label: t('user.settings.general.weekStartThursday')},
+	{value: 5, label: t('user.settings.general.weekStartFriday')},
+	{value: 6, label: t('user.settings.general.weekStartSaturday')},
 ])
 
 const dateDisplayOptions = computed(() => [