Add buttons to block and unblock domain (#3127)
* Add buttons to block and unblock domain * Relationship API now returns "domain_blocking" status for accounts, rename "block entire domain" to "hide entire domain", fix unblocking domain, do not block notifications from domain-blocked-but-followed people, do not send Salmons to domain blocked users * Add test * Personal domain blocks shouldn't affect Salmon after all, since in this direction of communication the control is very thin when it comes to public stuff. Best stay consistent and not affect federation in this way * Ignore followers and follow request from domain blocked folks, ensure account domain blocks are not created for empty domain, and avoid duplicates in validation * Purge followers when blocking domain (without soft-blocks, since they are useless here) * Add tests, fix local timeline being empty when having any domain blocks
This commit is contained in:
@ -1,17 +1,20 @@
|
||||
{
|
||||
"account.block": "Блокировать",
|
||||
"account.block_domain": "Hide everything from {domain}",
|
||||
"account.disclaimer": "Это пользователь с другого узла. Число может быть больше.",
|
||||
"account.edit_profile": "Изменить профиль",
|
||||
"account.follow": "Подписаться",
|
||||
"account.followers": "Подписаны",
|
||||
"account.follows": "Подписки",
|
||||
"account.follows_you": "Подписан(а) на Вас",
|
||||
"account.media": "Media",
|
||||
"account.mention": "Упомянуть",
|
||||
"account.mute": "Заглушить",
|
||||
"account.posts": "Посты",
|
||||
"account.report": "Пожаловаться",
|
||||
"account.requested": "Ожидает подтверждения",
|
||||
"account.unblock": "Разблокировать",
|
||||
"account.unblock_domain": "Unhide {domain}",
|
||||
"account.unfollow": "Отписаться",
|
||||
"account.unmute": "Снять глушение",
|
||||
"boost_modal.combo": "Нажмите {combo}, чтобы пропустить это в следующий раз",
|
||||
@ -40,6 +43,8 @@
|
||||
"confirmations.block.message": "Вы уверены, что хотите заблокировать {name}?",
|
||||
"confirmations.delete.confirm": "Удалить",
|
||||
"confirmations.delete.message": "Вы уверены, что хотите удалить этот статус?",
|
||||
"confirmations.domain_block.confirm": "Hide entire domain",
|
||||
"confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
|
||||
"confirmations.mute.confirm": "Заглушить",
|
||||
"confirmations.mute.message": "Вы уверены, что хотите заглушить {name}?",
|
||||
"emoji_button.activity": "Занятия",
|
||||
|
Reference in New Issue
Block a user