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

Provide a link to existing domain block when trying to block an already-blocked domain (#10663)

Browse Source 
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
This commit is contained in:
ThibG
2019-05-03 20:36:36 +02:00
committed by Eugen Rochko
parent eb63217210
commit 011b032300
6 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@ -269,6 +269,7 @@ en:
created_msg: Domain block is now being processed
destroyed_msg: Domain block has been undone
domain: Domain
existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
new:
create: Create block
hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.