From 39453de232e068f58a711b2c052fe74fdd0c40b6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Mar 2020 23:20:49 +0100
Subject: [PATCH] =?UTF-8?q?Change=20the=20string=20"Hide=20everything=20fr?=
=?UTF-8?q?om=20=E2=80=A6"=20to=20"Block=20domain=20=E2=80=A6"=20in=20web?=
=?UTF-8?q?=20UI=20(#13178)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Blocking a domain is closer to blocking all its users than to a mute
action.
---
.../mastodon/components/status_action_bar.js | 4 ++--
.../features/account/components/header.js | 4 ++--
.../features/status/components/action_bar.js | 4 ++--
.../mastodon/locales/defaultMessages.json | 18 +++++++++---------
app/javascript/mastodon/locales/en.json | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index e2c8d43c9..bebbbcb5a 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -36,8 +36,8 @@ const messages = defineMessages({
admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
- blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
- unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+ blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+ unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
});
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 8bd7f2db5..35cc3952f 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -29,8 +29,8 @@ const messages = defineMessages({
report: { id: 'account.report', defaultMessage: 'Report @{name}' },
share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
media: { id: 'account.media', defaultMessage: 'Media' },
- blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
- unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+ blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+ unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 959774da4..ba62d7b10 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -32,8 +32,8 @@ const messages = defineMessages({
admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' },
admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
- blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
- unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+ blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
+ unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
});
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 0eb054acd..4c1fe94c5 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -142,7 +142,7 @@
{
"descriptors": [
{
- "defaultMessage": "Unhide {domain}",
+ "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
}
],
@@ -451,11 +451,11 @@
"id": "status.copy"
},
{
- "defaultMessage": "Hide everything from {domain}",
+ "defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
},
{
- "defaultMessage": "Unhide {domain}",
+ "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@@ -697,11 +697,11 @@
"id": "account.media"
},
{
- "defaultMessage": "Hide everything from {domain}",
+ "defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
},
{
- "defaultMessage": "Unhide {domain}",
+ "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@@ -1470,7 +1470,7 @@
"id": "column.domain_blocks"
},
{
- "defaultMessage": "Unhide {domain}",
+ "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@@ -2384,11 +2384,11 @@
"id": "status.copy"
},
{
- "defaultMessage": "Hide everything from {domain}",
+ "defaultMessage": "Block domain {domain}",
"id": "account.block_domain"
},
{
- "defaultMessage": "Unhide {domain}",
+ "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain"
},
{
@@ -2944,4 +2944,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
-]
\ No newline at end of file
+]
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5927aeb6c..fff449a51 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -3,7 +3,7 @@
"account.badges.bot": "Bot",
"account.badges.group": "Group",
"account.block": "Block @{name}",
- "account.block_domain": "Hide everything from {domain}",
+ "account.block_domain": "Block domain {domain}",
"account.blocked": "Blocked",
"account.cancel_follow_request": "Cancel follow request",
"account.direct": "Direct message @{name}",
@@ -34,7 +34,7 @@
"account.share": "Share @{name}'s profile",
"account.show_reblogs": "Show boosts from @{name}",
"account.unblock": "Unblock @{name}",
- "account.unblock_domain": "Unhide {domain}",
+ "account.unblock_domain": "Unblock domain {domain}",
"account.unendorse": "Don't feature on profile",
"account.unfollow": "Unfollow",
"account.unmute": "Unmute @{name}",
--
GitLab