tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option to block direct messages from people you don't follow (#5669)

Browse Source 
* Add option to block direct messages from people you don't follow

Fix #5326

* If the DM responds to a toot by recipient, allow it through

* i18n: Update Polish translation (for #5669) (#5673)
This commit is contained in:
Eugen Rochko
2017-11-14 21:12:57 +01:00
committed by GitHub
parent c3ec1e87b8
commit fbef909c2a
7 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/simple_form.en.yml
View File

@ -54,6 +54,7 @@ en:
interactions:
must_be_follower: Block notifications from non-followers
must_be_following: Block notifications from people you don't follow
must_be_following_dm: Block direct messages from people you don't follow
notification_emails:
digest: Send digest e-mails
favourite: Send e-mail when someone favourites your status

1
config/locales/simple_form.pl.yml
View File

@ -58,6 +58,7 @@ pl:
interactions:
must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie śledzą
must_be_following: Nie wyświetlaj powiadomień od osób, których nie śledzisz
must_be_following_dm: Nie wyświetlaj wiadomości bezpośrednich od osób, których nie śledzisz
notification_emails:
digest: Wysyłaj podsumowania e-mailem
favourite: Powiadamiaj mnie e-mailem, gdy ktoś polubi mój wpis

1
config/settings.yml
View File

@ -36,6 +36,7 @@ defaults: &defaults
interactions:
must_be_follower: false
must_be_following: false
must_be_following_dm: false
reserved_usernames:
- admin
- support