update datepicker locale

src/components/date/datepickerWithRange.vue

@@ -81,7 +81,7 @@ import Popup from '@/components/misc/popup.vue'
 import {DATE_RANGES} from '@/components/date/dateRanges'
 import BaseButton from '@/components/base/BaseButton.vue'
 import DatemathHelp from '@/components/date/datemathHelp.vue'
-import { getFlatLanguage } from '@/helpers/dayLocale'
+import { getFlatpickrLanguage } from '@/helpers/dayLocale'
 
 const {t} = useI18n({useScope: 'global'})
 
@@ -92,7 +92,6 @@ const props = defineProps({
 	},
 })
 
-// FIXME: This seems to always contain the default value - that breaks the picker
 const flatPickerConfig = computed(() => ({
 	altFormat: t('date.altFormatLong'),
 	altInput: true,
@@ -100,7 +99,7 @@ const flatPickerConfig = computed(() => ({
 	enableTime: false,
 	wrap: true,
 	mode: 'range',
-	locale: getFlatLanguage(),
+	locale: getFlatpickrLanguage(),
 }))
 
 const showHowItWorks = ref(false)

src/components/input/datepickerInline.vue

@@ -81,7 +81,7 @@ import {calculateDayInterval} from '@/helpers/time/calculateDayInterval'
 import {calculateNearestHours} from '@/helpers/time/calculateNearestHours'
 import {createDateFromString} from '@/helpers/time/createDateFromString'
 import {useI18n} from 'vue-i18n'
-import { getFlatLanguage } from '@/helpers/dayLocale'
+import { getFlatpickrLanguage } from '@/helpers/dayLocale'
 
 const props = defineProps({
 	modelValue: {
@@ -112,7 +112,7 @@ const flatPickerConfig = computed(() => ({
 	enableTime: true,
 	time_24hr: true,
 	inline: true,
-	locale: getFlatLanguage(),
+	locale: getFlatpickrLanguage(),
 }))
 
 // Since flatpickr dates are strings, we need to convert them to native date objects.

src/components/tasks/partials/defer-task.vue

@@ -44,7 +44,7 @@ import flatPickr from 'vue-flatpickr-component'
 
 import TaskService from '@/services/task'
 import type {ITask} from '@/modelTypes/ITask'
-import { getFlatLanguage } from '@/helpers/dayLocale'
+import { getFlatpickrLanguage } from '@/helpers/dayLocale'
 
 const {
 	modelValue,
@@ -101,7 +101,7 @@ const flatPickerConfig = computed(() => ({
 	enableTime: true,
 	time_24hr: true,
 	inline: true,
-	locale: getFlatLanguage(),
+	locale: getFlatpickrLanguage(),
 }))
 
 function deferDays(days: number) {

src/helpers/dayLocale.ts

@@ -1,21 +1,21 @@
 import {useAuthStore} from '@/stores/auth'
 import FlatpickrLanguages from 'flatpickr/dist/l10n'
-import type { CustomLocale } from 'flatpickr/dist/types/locale'
+import type { CustomLocale, key } from 'flatpickr/dist/types/locale'
 
-export function getFlatLanguage(): CustomLocale {
+export function getFlatpickrLanguage(): CustomLocale {
 	const authStore = useAuthStore()
 	const lang = authStore.settings.language
-	const entries = Object.entries(FlatpickrLanguages).filter(([langKey]) => {
+	const langPair = lang.split('-')
-		if (lang === 'vi-VN') {
+	let language
-			return langKey === 'vn'
+	if (langPair.length === 0) {
-		} else {
-			return langKey === lang || lang.startsWith(langKey + '-')
-		}
-	})
-	let language = entries.at(0)?.[1]
-	// default english
-	if (language == undefined) {
 		language = FlatpickrLanguages['en']
+	}else if (!(langPair[0] in FlatpickrLanguages)) {
+		language = FlatpickrLanguages['en']
+	}else if (langPair[0] === 'vi') {
+		language = FlatpickrLanguages['vn']
+	}else{
+		const fkey = langPair[0] as key
+		language = FlatpickrLanguages[fkey]
 	}
 	language.firstDayOfWeek = authStore.settings.weekStart ?? 0
 	return language

src/views/project/ProjectGantt.vue

@@ -54,7 +54,7 @@ import {useI18n} from 'vue-i18n'
 import type {RouteLocationNormalized} from 'vue-router'
 
 import {useBaseStore} from '@/stores/base'
-import { getFlatLanguage } from '@/helpers/dayLocale'
+import { getFlatpickrLanguage } from '@/helpers/dayLocale'
 
 import Foo from '@/components/misc/flatpickr/Flatpickr.vue'
 import ProjectWrapper from '@/components/project/ProjectWrapper.vue'
@@ -132,7 +132,7 @@ const flatPickerConfig = computed<Options>(() => ({
 	defaultDate: initialDateRange,
 	enableTime: false,
 	mode: 'range',
-	locale: getFlatLanguage(),
+	locale: getFlatpickrLanguage(),
 }))
 </script>
 

src/views/user/settings/ApiTokens.vue

@@ -12,8 +12,7 @@ import 'flatpickr/dist/flatpickr.css'
 import {useI18n} from 'vue-i18n'
 import Message from '@/components/misc/message.vue'
 import type {IApiToken} from '@/modelTypes/IApiToken'
-import FlatpickrLanguages from 'flatpickr/dist/l10n'
+import { getFlatpickrLanguage } from '@/helpers/dayLocale'
-import { getFlatLanguage } from '@/helpers/dayLocale'
 
 const service = new ApiTokenService()
 const tokens = ref<IApiToken[]>([])
@@ -42,7 +41,7 @@ const flatPickerConfig = computed(() => ({
 	dateFormat: 'Y-m-d H:i',
 	enableTime: true,
 	time_24hr: true,
-	locale: getFlatLanguage(),
+	locale: getFlatpickrLanguage(),
 	minDate: now,
 }))