only include direction on timestamps when required #108

Merged
floatingghost merged 2 commits from timeago-fix into develop 2022-08-03 14:07:19 +00:00
3 changed files with 15 additions and 6 deletions

View file

@ -151,6 +151,7 @@
>
<Timeago
:time="notification.created_at"
:with-direction="true"
:auto-update="240"
/>
</router-link>

View file

@ -187,6 +187,7 @@
>
<Timeago
:time="status.created_at"
:with-direction="true"
:auto-update="60"
/>
</router-link>

View file

@ -4,11 +4,18 @@
:title="localeDateString"
:class="{ warning: relativeTime.direction === 'time.in_future' }"
>
{{
relativeTime.direction === '' ?
$tc(relativeTime.key, relativeTime.num, [relativeTime.num]) :
$t(relativeTime.direction, [$tc(relativeTime.key, relativeTime.num, [relativeTime.num])])
}}
<template
v-if="withDirection"
>
{{
relativeTime.direction === '' ?
$tc(relativeTime.key, relativeTime.num, [relativeTime.num]) :
$t(relativeTime.direction, [$tc(relativeTime.key, relativeTime.num, [relativeTime.num])])
}}
</template>
<template v-else>
{{ $tc(relativeTime.key, relativeTime.num, [relativeTime.num]) }}
</template>
</time>
</template>
@ -18,7 +25,7 @@ import localeService from 'src/services/locale/locale.service.js'
export default {
name: 'Timeago',
props: ['time', 'autoUpdate', 'longFormat', 'nowThreshold'],
props: ['time', 'autoUpdate', 'longFormat', 'nowThreshold', 'withDirection'],
data () {
return {
relativeTime: { key: 'time.now', num: 0 },