Merge branch 'multi-choice-poll-wording' into 'develop'

Display 'people voted' instead of 'votes' for multi-answers polls

Closes #993

See merge request pleroma/pleroma-fe!1341
This commit is contained in:
Shpuld Shpludson 2021-02-12 19:15:42 +00:00
commit 7f3fd9ca21
3 changed files with 10 additions and 1 deletions

View file

@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Button to remove uploaded media in post status form is now properly placed and sized. - Button to remove uploaded media in post status form is now properly placed and sized.
- Fixed shoutbox not working in mobile layout - Fixed shoutbox not working in mobile layout
### Changed
- Display 'people voted' instead of 'votes' for multi-choice polls
## [2.2.3] - 2021-01-18 ## [2.2.3] - 2021-01-18
### Added ### Added

View file

@ -58,7 +58,12 @@
{{ $t('polls.vote') }} {{ $t('polls.vote') }}
</button> </button>
<div class="total"> <div class="total">
{{ totalVotesCount }} {{ $t("polls.votes") }}&nbsp;·&nbsp; <template v-if="typeof poll.voters_count === 'number'">
{{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
</template>
<template v-else>
{{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
</template>
</div> </div>
<i18n :path="expired ? 'polls.expired' : 'polls.expires_in'"> <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'">
<Timeago <Timeago

View file

@ -152,6 +152,8 @@
"add_option": "Add Option", "add_option": "Add Option",
"option": "Option", "option": "Option",
"votes": "votes", "votes": "votes",
"people_voted_count": "{count} person voted | {count} people voted",
"votes_count": "{count} vote | {count} votes",
"vote": "Vote", "vote": "Vote",
"type": "Poll type", "type": "Poll type",
"single_choice": "Single choice", "single_choice": "Single choice",