ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'main' into vue3

Browse Source 
# Conflicts:
#	src/components/input/editor.vue
#	src/components/list/partials/filters.vue
#	src/components/tasks/partials/editAssignees.vue
#	src/helpers/find.ts
#	src/helpers/time/formatDate.js
#	src/main.ts
#	src/store/modules/attachments.js
#	src/store/modules/kanban.js
#	src/views/list/views/List.vue
#	yarn.lock
This commit is contained in:
Dominik Pschenitschni
2021-10-07 12:20:52 +02:00
parent 66648be6d5 faa2daa876
commit 3a7a4bdc42
120 changed files with 717 additions and 272 deletions
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 {format, formatDistance} from 'date-fns'
import {format, formatDistanceToNow} from 'date-fns'
import {enGB, de, fr, ru} from 'date-fns/locale'
import {i18n} from '@/i18n'
@ -39,12 +39,8 @@ export const formatDateSince = (date) => {
date = createDateFromString(date)
const currentDate = new Date()
const distance = formatDistance(date, currentDate, {locale: locales[i18n.global.t('date.locale')]})
if (date > currentDate) {
return i18n.global.t('date.in', {date: distance})
}
return i18n.global.t('date.ago', {date: distance})
return formatDistanceToNow(date, {
locale: locales[i18n.global.t('date.locale')],
addSuffix: true,
})
}