only include direction on timestamps when required
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful

This commit is contained in:
FloatingGhost 2022-08-03 14:28:06 +01:00
parent ef41494bad
commit 804ba0cdb6
3 changed files with 15 additions and 7 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,12 +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])])
}}
</time>
<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>
<script>
@ -18,7 +24,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 },