diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-03-22 08:17:33 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-03-22 08:17:33 +0000 |
| commit | 23edfe7b918844f8cc2ff5b9b245952092ee1cbf (patch) | |
| tree | 1f03173caa74258b8becceaa896e732772a48c48 /src/components/poll/poll.vue | |
| parent | 698d6085918c012150a16ffaf24d34970629542d (diff) | |
| parent | 8562fd2da681497f798fa50eaa449966aa69c483 (diff) | |
Merge branch 'non-expiring-polls' into 'develop'
Hide the expiry date indication if the poll never expires
Closes #961
See merge request pleroma/pleroma-fe!1889
Diffstat (limited to 'src/components/poll/poll.vue')
| -rw-r--r-- | src/components/poll/poll.vue | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index b3a74c49..f7e16665 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -75,13 +75,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'" |