From aac6d0df27cb6b8b6b781bf8b07dff3402eece95 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 13 Jan 2020 14:01:10 +0300 Subject: [PATCH] Improve quiz phrases. --- Telegram/Resources/langs/lang.strings | 3 +++ .../history/view/media/history_view_poll.cpp | 24 +++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index e5c505e876..b606a086d6 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2173,6 +2173,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_polls_votes_count#one" = "{count} vote"; "lng_polls_votes_count#other" = "{count} votes"; "lng_polls_votes_none" = "No votes"; +"lng_polls_answers_count#one" = "{count} answer"; +"lng_polls_answers_count#other" = "{count} answers"; +"lng_polls_answers_none" = "No answers"; "lng_polls_submit_votes" = "Submit votes"; "lng_polls_view_results" = "View results"; "lng_polls_retract" = "Retract vote"; diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp index cd79937153..b298236c7f 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp @@ -511,9 +511,17 @@ void Poll::updateTotalVotes() { return; } _totalVotes = _poll->totalVoters; + const auto quiz = _poll->quiz(); const auto string = !_totalVotes - ? tr::lng_polls_votes_none(tr::now) - : tr::lng_polls_votes_count(tr::now, lt_count_short, _totalVotes); + ? (quiz + ? tr::lng_polls_answers_none + : tr::lng_polls_votes_none)(tr::now) + : (quiz + ? tr::lng_polls_answers_count + : tr::lng_polls_votes_count)( + tr::now, + lt_count_short, + _totalVotes); _totalVotesLabel.setText(st::msgDateTextStyle, string); } @@ -1064,9 +1072,17 @@ TextState Poll::textState(QPoint point, StateRequest request) const { result.customTooltip = true; using Flag = Ui::Text::StateRequest::Flag; if (request.flags & Flag::LookupCustomTooltip) { + const auto quiz = _poll->quiz(); result.customTooltipText = answer.votes - ? tr::lng_polls_votes_count(tr::now, lt_count_decimal, answer.votes) - : tr::lng_polls_votes_none(tr::now); + ? (quiz + ? tr::lng_polls_answers_count + : tr::lng_polls_votes_count)( + tr::now, + lt_count_decimal, + answer.votes) + : (quiz + ? tr::lng_polls_answers_none + : tr::lng_polls_votes_none)(tr::now); } } return result;