logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://anongit.hacktivis.me/git/pleroma-fe.git/
commit: 9e65b176447f7e125ed4e792110e21eb7c3ef21e
parent f127ae307b3a444f13c6f8b75ba99cf61244677e
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Sat, 21 Sep 2024 08:19:16 +0000

Merge branch 'non-anonymous-polls' into 'develop'

Inform users that Smithereen public polls are public

See merge request pleroma/pleroma-fe!1932

Diffstat:

Achangelog.d/non-anonymous-polls.add2++
Msrc/components/poll/poll.vue7+++++++
Msrc/i18n/en.json4+++-
3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/changelog.d/non-anonymous-polls.add b/changelog.d/non-anonymous-polls.add @@ -0,0 +1 @@ +Inform users that Smithereen public polls are public +\ No newline at end of file diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue @@ -76,6 +76,13 @@ > {{ $t('polls.vote') }} </button> + <span + v-if="poll.pleroma?.non_anonymous" + :title="$t('polls.non_anonymous_title')" + > + {{ $t('polls.non_anonymous') }} + &nbsp;·&nbsp; + </span> <div class="total"> <template v-if="typeof poll.voters_count === 'number'"> {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }} diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -229,7 +229,9 @@ "expiry": "Poll age", "expires_in": "Poll ends in {0}", "expired": "Poll ended {0} ago", - "not_enough_options": "Too few unique options in poll" + "not_enough_options": "Too few unique options in poll", + "non_anonymous": "Public poll", + "non_anonymous_title": "Other instances may display the options you voted for" }, "emoji": { "stickers": "Stickers",