Merge remote-tracking branch 'origin/develop' into themes3
This commit is contained in:
commit
e51278cdf1
8 changed files with 1010 additions and 281 deletions
|
|
@ -78,13 +78,16 @@
|
|||
</button>
|
||||
<div class="total">
|
||||
<template v-if="typeof poll.voters_count === 'number'">
|
||||
{{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }} ·
|
||||
{{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }} ·
|
||||
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}
|
||||
</template>
|
||||
<span v-if="expiresAt !== null">
|
||||
·
|
||||
</span>
|
||||
</div>
|
||||
<span>
|
||||
<span v-if="expiresAt !== null">
|
||||
<i18n-t
|
||||
scope="global"
|
||||
:keypath="expired ? 'polls.expired' : 'polls.expires_in'"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue