scalie-business/mastodon
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change the string "Hide everything from …" to "Block domain …" in web UI (#13178)

Browse source 
Blocking a domain is closer to blocking all its users than to a mute
action.
This commit is contained in:
Eugen Rochko 2020-03-05 23:20:49 +01:00 • committed by GitHub
parent d081a80cff
commit 39453de232
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/components/status_action_bar.js
View file

@ -36,8 +36,8 @@ const messages = defineMessages({
admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' }, 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' }, admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to status' }, copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' }, blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' }, unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }, unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
}); });

4
app/javascript/mastodon/features/account/components/header.js
View file

@ -29,8 +29,8 @@ const messages = defineMessages({
report: { id: 'account.report', defaultMessage: 'Report @{name}' }, report: { id: 'account.report', defaultMessage: 'Report @{name}' },
share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' }, share: { id: 'account.share', defaultMessage: 'Share @{name}\'s profile' },
media: { id: 'account.media', defaultMessage: 'Media' }, media: { id: 'account.media', defaultMessage: 'Media' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' }, blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' }, unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' }, hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' }, showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },

4
app/javascript/mastodon/features/status/components/action_bar.js
View file

@ -32,8 +32,8 @@ const messages = defineMessages({
admin_account: { id: 'status.admin_account', defaultMessage: 'Open moderation interface for @{name}' }, 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' }, admin_status: { id: 'status.admin_status', defaultMessage: 'Open this status in the moderation interface' },
copy: { id: 'status.copy', defaultMessage: 'Copy link to status' }, copy: { id: 'status.copy', defaultMessage: 'Copy link to status' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' }, blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' }, unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }, unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
}); });

18
app/javascript/mastodon/locales/defaultMessages.json
View file

@ -142,7 +142,7 @@
{ {
"descriptors": [ "descriptors": [
{ {
"defaultMessage": "Unhide {domain}", "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain" "id": "account.unblock_domain"
} }
], ],
@ -451,11 +451,11 @@
"id": "status.copy" "id": "status.copy"
}, },
{ {
"defaultMessage": "Hide everything from {domain}", "defaultMessage": "Block domain {domain}",
"id": "account.block_domain" "id": "account.block_domain"
}, },
{ {
"defaultMessage": "Unhide {domain}", "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain" "id": "account.unblock_domain"
}, },
{ {
@ -697,11 +697,11 @@
"id": "account.media" "id": "account.media"
}, },
{ {
"defaultMessage": "Hide everything from {domain}", "defaultMessage": "Block domain {domain}",
"id": "account.block_domain" "id": "account.block_domain"
}, },
{ {
"defaultMessage": "Unhide {domain}", "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain" "id": "account.unblock_domain"
}, },
{ {
@ -1470,7 +1470,7 @@
"id": "column.domain_blocks" "id": "column.domain_blocks"
}, },
{ {
"defaultMessage": "Unhide {domain}", "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain" "id": "account.unblock_domain"
}, },
{ {
@ -2384,11 +2384,11 @@
"id": "status.copy" "id": "status.copy"
}, },
{ {
"defaultMessage": "Hide everything from {domain}", "defaultMessage": "Block domain {domain}",
"id": "account.block_domain" "id": "account.block_domain"
}, },
{ {
"defaultMessage": "Unhide {domain}", "defaultMessage": "Unblock domain {domain}",
"id": "account.unblock_domain" "id": "account.unblock_domain"
}, },
{ {
@ -2944,4 +2944,4 @@
], ],
"path": "app/javascript/mastodon/features/video/index.json" "path": "app/javascript/mastodon/features/video/index.json"
} }
] ]

4
app/javascript/mastodon/locales/en.json
View file

@ -3,7 +3,7 @@
"account.badges.bot": "Bot", "account.badges.bot": "Bot",
"account.badges.group": "Group", "account.badges.group": "Group",
"account.block": "Block @{name}", "account.block": "Block @{name}",
"account.block_domain": "Hide everything from {domain}", "account.block_domain": "Block domain {domain}",
"account.blocked": "Blocked", "account.blocked": "Blocked",
"account.cancel_follow_request": "Cancel follow request", "account.cancel_follow_request": "Cancel follow request",
"account.direct": "Direct message @{name}", "account.direct": "Direct message @{name}",
@ -34,7 +34,7 @@
"account.share": "Share @{name}'s profile", "account.share": "Share @{name}'s profile",
"account.show_reblogs": "Show boosts from @{name}", "account.show_reblogs": "Show boosts from @{name}",
"account.unblock": "Unblock @{name}", "account.unblock": "Unblock @{name}",
"account.unblock_domain": "Unhide {domain}", "account.unblock_domain": "Unblock domain {domain}",
"account.unendorse": "Don't feature on profile", "account.unendorse": "Don't feature on profile",
"account.unfollow": "Unfollow", "account.unfollow": "Unfollow",
"account.unmute": "Unmute @{name}", "account.unmute": "Unmute @{name}",