kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(user): support all weekdays as week start

This commit is contained in:
Xela 2026-04-21 01:30:53 +00:00 committed by kolaente
parent 2b76a6b3fe
commit 4add8abaa1
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/helpers/useFlatpickrLanguage.ts
View File

@ -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
})

5
frontend/src/i18n/lang/en.json
View File

@ -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",

6
frontend/src/views/user/settings/General.vue
View File

@ -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(() => [