bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'features/polls-behind-cws' into 'develop'

Browse source 
Put poll options behind content warnings

See merge request soapbox-pub/soapbox-fe!653
This commit is contained in:
Alex Gleason 2021-08-02 16:01:44 +00:00
commit 836feb603d
6 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/components/status.js
View file

Binary file not shown.

BIN
app/soapbox/components/status_content.js
View file

Binary file not shown.

BIN
app/soapbox/features/scheduled_statuses/components/poll_preview.js Normal file
View file

Binary file not shown.

BIN
app/soapbox/features/scheduled_statuses/components/scheduled_status.js
View file

Binary file not shown.

BIN
app/soapbox/features/status/components/detailed_status.js
View file

Binary file not shown.

4
app/soapbox/locales/pl.json
View file

@ -210,6 +210,8 @@
"compose_form.publish": "Wyślij",
"compose_form.publish_loud": "{publish}!",
"compose_form.schedule": "Zaplanuj",
"compose_form.scheduled_statuses.click_here": "Naciśnij tutaj",
"compose_form.scheduled_statuses.message": "Masz zaplanowane wpisy. {click_here}, aby je zobaczyć.",
"compose_form.sensitive.hide": "Oznacz multimedia jako wrażliwe",
"compose_form.sensitive.marked": "Zawartość multimedia jest oznaczona jako wrażliwa",
"compose_form.sensitive.unmarked": "Zawartość multimedialna nie jest oznaczona jako wrażliwa",
@ -222,7 +224,7 @@
"confirmations.admin.delete_local_user.checkbox": "Wiem, że właśnie usuwam lokalnego użytkownika.",
"confirmations.admin.delete_status.confirm": "Usuń wpis",
"confirmations.admin.delete_status.message": "Zamierzasz usunąć wpis użytkownika @{acct}. To działanie nie może zostać cofnięte.",
"confirmations.admin.delete_user.confirm": "@Usuń {name}",
"confirmations.admin.delete_user.confirm": "Usuń @{name}",
"confirmations.admin.delete_user.message": "Zamierzasz usunąć @{acct}. TO DZIAŁANIE NIE MOŻE ZOSTAĆ COFNIĘTE.",
"confirmations.admin.mark_status_not_sensitive.confirm": "Oznacz wpis jako niewrażliwy",
"confirmations.admin.mark_status_not_sensitive.message": "Zamierzasz oznaczyć wpis {acct} jako niewrażliwy.",