ami/tl-vikunja
1
0
Fork 0
Code

fix(gantt): useDayjsLanguageSync and move to separate file

Browse Source
This commit is contained in:
Dominik Pschenitschni 2022-10-26 15:47:58 +02:00 committed by kolaente
parent b4f88bd4a6
commit d8d3e4c8a6
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/i18n/index.ts
View File

@ -22,10 +22,6 @@ export const DEFAULT_LANGUAGE: SupportedLocale= 'en'
export type ISOLanguage = string export type ISOLanguage = string
export const DAYJS_LOCALE_MAPPING = {
'de-swiss': 'de-AT',
} as Record<SupportedLocale, ISOLanguage>
export const i18n = createI18n({ export const i18n = createI18n({
locale: DEFAULT_LANGUAGE, // set locale locale: DEFAULT_LANGUAGE, // set locale
fallbackLocale: DEFAULT_LANGUAGE, fallbackLocale: DEFAULT_LANGUAGE,
@ -85,35 +81,4 @@ export function saveLanguage(lang: SupportedLocale) {
export function setLanguage() { export function setLanguage() {
return loadLanguageAsync(getCurrentLanguage()) return loadLanguageAsync(getCurrentLanguage())
} }
// FIXME: This function is not used at the moment because it does not seem to work.
// It should be reworked and cleaned up. An even better way would be to get rid of
// this completely by using date-fns for everything.
// export function useDayjsLanguageSync(dayjsGlobal: typeof dayjs) {
// const dayjsLanguageLoaded = ref(false)
// watch(
// () => i18n.global.locale,
// async (currentLanguage: string) => {
// if (!dayjsGlobal) {
// return
// }
// const dayjsLanguageCode = DAYJS_LOCALE_MAPPING[currentLanguage.toLowerCase()] || currentLanguage.toLowerCase()
// dayjsLanguageLoaded.value = dayjsGlobal.locale() === dayjsLanguageCode
// if (dayjsLanguageLoaded.value) {
// return
// }
// console.log('foo')
// await import(`../../node_modules/dayjs/locale/${dayjsLanguageCode}.js`)
// console.log('bar')
// dayjsGlobal.locale(dayjsLanguageCode)
// dayjsLanguageLoaded.value = true
// },
// {immediate: true},
// )
//
// // we export the loading state since that's easier to work with
// const isLoading = computed(() => !dayjsLanguageLoaded.value)
//
// return isLoading
// }

60
src/i18n/useDayjsLanguageSync.ts Normal file
View File

@ -0,0 +1,60 @@
import {computed, ref, watch} from 'vue'
import type dayjs from 'dayjs'
import type ILocale from 'dayjs/locale/*'
import {i18n, type SupportedLocale, type ISOLanguage} from '@/i18n'
export const DAYJS_LOCALE_MAPPING = {
'de-de': 'de',
'de-swiss': 'de-at',
'ru-ru': 'ru',
'fr-fr': 'fr',
'vi-vn': 'vi',
'it-it': 'it',
'cs-cz': 'cs',
'pl-pl': 'pl',
'nl-nl': 'nl',
'pt-pt': 'pt',
'zh-cn': 'zh-cn',
} as Record<SupportedLocale, ISOLanguage>
export const DAYJS_LANGUAGE_IMPORTS = {
'de-de': () => import('dayjs/locale/de'),
'de-swiss': () => import('dayjs/locale/de-at'),
'ru-ru': () => import('dayjs/locale/ru'),
'fr-fr': () => import('dayjs/locale/fr'),
'vi-vn': () => import('dayjs/locale/vi'),
'it-it': () => import('dayjs/locale/it'),
'cs-cz': () => import('dayjs/locale/cs'),
'pl-pl': () => import('dayjs/locale/pl'),
'nl-nl': () => import('dayjs/locale/nl'),
'pt-pt': () => import('dayjs/locale/pt'),
'zh-cn': () => import('dayjs/locale/zh-cn'),
} as Record<SupportedLocale, () => Promise<ILocale>>
export function useDayjsLanguageSync(dayjsGlobal: typeof dayjs) {
const dayjsLanguageLoaded = ref(false)
watch(
() => i18n.global.locale,
async (currentLanguage: string) => {
if (!dayjsGlobal) {
return
}
const dayjsLanguageCode = DAYJS_LOCALE_MAPPING[currentLanguage.toLowerCase()] || currentLanguage.toLowerCase()
dayjsLanguageLoaded.value = dayjsGlobal.locale() === dayjsLanguageCode
if (dayjsLanguageLoaded.value) {
return
}
await DAYJS_LANGUAGE_IMPORTS[currentLanguage.toLowerCase()]()
dayjsGlobal.locale(dayjsLanguageCode)
dayjsLanguageLoaded.value = true
},
{immediate: true},
)
// we export the loading state since that's easier to work with
const isLoading = computed(() => !dayjsLanguageLoaded.value)
return isLoading
}