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

fix(frontend): respect week_start setting when language is not explicitly set

This commit is contained in:
Xela 2026-04-21 16:37:03 -08:00 committed by kolaente
parent cbd5bf8d94
commit 96e08fcbdb
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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