ami/tl-vikunja
1
0
Fork 0
Code Activity

feat: use vue-i18n 9 for vue3

Browse Source
This commit is contained in:
Dominik Pschenitschni
2021-08-20 15:38:16 +02:00
parent 3d6aca3510
commit 7c3c2945f8
19 changed files with 123 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/helpers/getListTitle.js
View File

@ -1,6 +1,8 @@
export const getListTitle = (l, $t) => {
import {i18n} from '@/i18n'
export const getListTitle = (l) => {
if (l.id === -1) {
return $t('list.pseudo.favorites.title')
return i18n.global.t('list.pseudo.favorites.title')
}
return l.title
}

10
src/helpers/getNamespaceTitle.js
View File

@ -1,12 +1,14 @@
export const getNamespaceTitle = (n, $t) => {
import {i18n} from '@/i18n'
export const getNamespaceTitle = (n) => {
if (n.id === -1) {
return $t('namespace.pseudo.sharedLists.title')
return i18n.global.t('namespace.pseudo.sharedLists.title')
}
if (n.id === -2) {
return $t('namespace.pseudo.favorites.title')
return i18n.global.t('namespace.pseudo.favorites.title')
}
if (n.id === -3) {
return $t('namespace.pseudo.savedFilters.title')
return i18n.global.t('namespace.pseudo.savedFilters.title')
}
return n.title
}

20
src/helpers/time/formatDate.js
View File

@ -2,6 +2,8 @@ import {createDateFromString} from '@/helpers/time/createDateFromString'
import {format, formatDistance} from 'date-fns'
import {enGB, de, fr, ru} from 'date-fns/locale'
import {i18n} from '@/i18n'
const locales = {en: enGB, de, ch: de, fr, ru}
const dateIsValid = date => {
@ -12,7 +14,7 @@ const dateIsValid = date => {
return date instanceof Date && !isNaN(date)
}
export const formatDate = (date, f, locale) => {
export const formatDate = (date, f, locale = i18n.global.t('date.locale')) => {
if (!dateIsValid(date)) {
return ''
}
@ -22,7 +24,15 @@ export const formatDate = (date, f, locale) => {
return date ? format(date, f, {locale: locales[locale]}) : ''
}
export const formatDateSince = (date, $t) => {
export function formatDateLong(date) {
return formatDate(date, 'PPPPpppp')
}
export function formatDateShort(date) {
return formatDate(date, 'PPpp')
}
export const formatDateSince = (date) => {
if (!dateIsValid(date)) {
return ''
}
@ -30,11 +40,11 @@ export const formatDateSince = (date, $t) => {
date = createDateFromString(date)
const currentDate = new Date()
const distance = formatDistance(date, currentDate, {locale: locales[$t('date.locale')]})
const distance = formatDistance(date, currentDate, {locale: locales[i18n.global.t('date.locale')]})
if (date > currentDate) {
return $t('date.in', {date: distance})
return i18n.global.t('date.in', {date: distance})
}
return $t('date.ago', {date: distance})
return i18n.global.t('date.ago', {date: distance})
}