diff options
author | Sasha Sorokin <10401817+Brawaru@users.noreply.github.com> | 2021-10-13 09:59:31 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-13 04:59:31 +0200 |
commit | 89b5071fde2f111eaa53ce404712423de25a593d (patch) | |
tree | 56ccf084753b1e4316916316992aaf832f3fc8c6 /app | |
parent | c99d28369a61292f6ffaf6bc552fba6738ea485c (diff) |
Add single option votes tooltip in polls (#16849)
Adds a tooltip when hovering over the percentages in a poll showing how many votes were cast for that option. Also removes descriptions from messages here since they are not picked up by Crowdin anyway and might be confusing to other developers :) Fixes #16820
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/components/poll.js | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/app/javascript/mastodon/components/poll.js b/app/javascript/mastodon/components/poll.js index 477f56e13..85aa28816 100644 --- a/app/javascript/mastodon/components/poll.js +++ b/app/javascript/mastodon/components/poll.js @@ -12,8 +12,18 @@ import RelativeTimestamp from './relative_timestamp'; import Icon from 'mastodon/components/icon'; const messages = defineMessages({ - closed: { id: 'poll.closed', defaultMessage: 'Closed' }, - voted: { id: 'poll.voted', defaultMessage: 'You voted for this answer', description: 'Tooltip of the "voted" checkmark in polls' }, + closed: { + id: 'poll.closed', + defaultMessage: 'Closed', + }, + voted: { + id: 'poll.voted', + defaultMessage: 'You voted for this answer', + }, + votes: { + id: 'poll.votes', + defaultMessage: '{votes, plural, one {# vote} other {# votes}}', + }, }); const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => { @@ -148,9 +158,16 @@ class Poll extends ImmutablePureComponent { data-index={optionIndex} /> )} - {showResults && <span className='poll__number'> - {Math.round(percent)}% - </span>} + {showResults && ( + <span + className='poll__number' + title={intl.formatMessage(messages.votes, { + votes: option.get('votes_count'), + })} + > + {Math.round(percent)}% + </span> + )} <span className='poll__option__text translate' |