local-it/vikunja-frontend
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: properly resolve relative date translations

Browse source 
Resolves #798
This commit is contained in:
kolaente 2021-10-04 21:33:20 +02:00
parent 240e8594cc
commit d583cb2094
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/helpers/time/formatDate.js
View file

@ -1,5 +1,5 @@
import {createDateFromString} from '@/helpers/time/createDateFromString' import {createDateFromString} from '@/helpers/time/createDateFromString'
import {format, formatDistance} from 'date-fns' import {format, formatDistanceToNow} from 'date-fns'
import {enGB, de, fr, ru} from 'date-fns/locale' import {enGB, de, fr, ru} from 'date-fns/locale'
const locales = {en: enGB, de, ch: de, fr, ru} const locales = {en: enGB, de, ch: de, fr, ru}
@ -29,12 +29,8 @@ export const formatDateSince = (date, $t) => {
date = createDateFromString(date) date = createDateFromString(date)
const currentDate = new Date() return formatDistanceToNow(date, {
const distance = formatDistance(date, currentDate, {locale: locales[$t('date.locale')]}) locale: locales[$t('date.locale')],
addSuffix: true,
if (date > currentDate) { })
return $t('date.in', {date: distance})
}
return $t('date.ago', {date: distance})
} }

2
src/i18n/lang/en.json
View file

@ -796,8 +796,6 @@
}, },
"date": { "date": {
"locale": "en", "locale": "en",
"in": "in {date}",
"ago": "{date} ago",
"altFormatLong": "j M Y H:i", "altFormatLong": "j M Y H:i",
"altFormatShort": "j M Y" "altFormatShort": "j M Y"
}, },