diff --git a/CHANGELOG.md b/CHANGELOG.md index 660729799b3e533f4b06d68bcb9678b351f8cb19..cf4be7da4543cc98a18238fbd89284c0e1237a08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. - Fixed shoutbox not working in mobile layout +### Changed +- Display 'people voted' instead of 'votes' for multi-choice polls ## [2.2.3] - 2021-01-18 ### Added diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 42819c19faca04f250350bb1d0f20699d96b12d4..187d1829d554b68d12beda18b35cbd168115356c 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -58,7 +58,12 @@ {{ $t('polls.vote') }} </button> <div class="total"> - {{ totalVotesCount }} {{ $t("polls.votes") }} · + <template v-if="typeof poll.voters_count === 'number'"> + {{ $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 }) }} · + </template> </div> <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'"> <Timeago diff --git a/src/i18n/en.json b/src/i18n/en.json index 3946f3cd2dedc1f8422c793e7df7d0f07b4d80c1..46614ef1c82d8d63e6934a26cdf69f7be54f4ece 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -152,6 +152,8 @@ "add_option": "Add Option", "option": "Option", "votes": "votes", + "people_voted_count": "{count} person voted | {count} people voted", + "votes_count": "{count} vote | {count} votes", "vote": "Vote", "type": "Poll type", "single_choice": "Single choice",