Fix hashtag link to directory in AdminUI (#12005)
* Fixed not to generate link if no user used hashtag in directory * Added missing translation for AdminUI custom emojis * run yarn manage:translations en
This commit is contained in:
parent
f7c146a9e1
commit
b258583d2b
4 changed files with 43 additions and 78 deletions
|
@ -238,6 +238,14 @@
|
|||
"description": "Tooltip of the \"voted\" checkmark in polls",
|
||||
"id": "poll.voted"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{count, plural, one {# person} other {# people}}",
|
||||
"id": "poll.total_people"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{count, plural, one {# vote} other {# votes}}",
|
||||
"id": "poll.total_votes"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Vote",
|
||||
"id": "poll.vote"
|
||||
|
@ -245,10 +253,6 @@
|
|||
{
|
||||
"defaultMessage": "Refresh",
|
||||
"id": "poll.refresh"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{count, plural, one {# vote} other {# votes}}",
|
||||
"id": "poll.total_votes"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/components/poll.json"
|
||||
|
@ -498,10 +502,6 @@
|
|||
"defaultMessage": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
|
||||
"id": "confirmations.redraft.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block",
|
||||
"id": "confirmations.block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Reply",
|
||||
"id": "confirmations.reply.confirm"
|
||||
|
@ -509,14 +509,6 @@
|
|||
{
|
||||
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
|
||||
"id": "confirmations.reply.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block & Report",
|
||||
"id": "confirmations.block.block_and_report"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to block {name}?",
|
||||
"id": "confirmations.block.message"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/containers/status_container.json"
|
||||
|
@ -553,26 +545,14 @@
|
|||
"defaultMessage": "Unfollow",
|
||||
"id": "confirmations.unfollow.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block",
|
||||
"id": "confirmations.block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide entire domain",
|
||||
"id": "confirmations.domain_block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block & Report",
|
||||
"id": "confirmations.block.block_and_report"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to unfollow {name}?",
|
||||
"id": "confirmations.unfollow.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to block {name}?",
|
||||
"id": "confirmations.block.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "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. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
|
||||
"id": "confirmations.domain_block.message"
|
||||
|
@ -1134,15 +1114,6 @@
|
|||
],
|
||||
"path": "app/javascript/mastodon/features/compose/components/upload_form.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Uploading...",
|
||||
"id": "upload_progress.label"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/compose/components/upload_progress.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
|
@ -1635,6 +1606,10 @@
|
|||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Basic",
|
||||
"id": "home.column_settings.basic"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Show boosts",
|
||||
"id": "home.column_settings.show_reblogs"
|
||||
|
@ -2016,14 +1991,6 @@
|
|||
"defaultMessage": "Push notifications",
|
||||
"id": "notifications.column_settings.push"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Basic",
|
||||
"id": "home.column_settings.basic"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Update in real-time",
|
||||
"id": "home.column_settings.update_live"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Quick filter bar",
|
||||
"id": "notifications.column_settings.filter_bar.category"
|
||||
|
@ -2082,10 +2049,6 @@
|
|||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "and {count, plural, one {# other} other {# others}}",
|
||||
"id": "notification.and_n_others"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "{name} followed you",
|
||||
"id": "notification.follow"
|
||||
|
@ -2273,10 +2236,6 @@
|
|||
"defaultMessage": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
|
||||
"id": "confirmations.redraft.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block",
|
||||
"id": "confirmations.block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Reply",
|
||||
"id": "confirmations.reply.confirm"
|
||||
|
@ -2284,14 +2243,6 @@
|
|||
{
|
||||
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
|
||||
"id": "confirmations.reply.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block & Report",
|
||||
"id": "confirmations.block.block_and_report"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to block {name}?",
|
||||
"id": "confirmations.block.message"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/status/containers/detailed_status_container.json"
|
||||
|
@ -2314,10 +2265,6 @@
|
|||
"defaultMessage": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
|
||||
"id": "confirmations.redraft.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block",
|
||||
"id": "confirmations.block.confirm"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Show more for all",
|
||||
"id": "status.show_more_all"
|
||||
|
@ -2337,21 +2284,30 @@
|
|||
{
|
||||
"defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
|
||||
"id": "confirmations.reply.message"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/status/index.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to block {name}?",
|
||||
"id": "confirmations.block.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Cancel",
|
||||
"id": "confirmation_modal.cancel"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Block & Report",
|
||||
"id": "confirmations.block.block_and_report"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Toot",
|
||||
"id": "column.status"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Are you sure you want to block {name}?",
|
||||
"id": "confirmations.block.message"
|
||||
"defaultMessage": "Block",
|
||||
"id": "confirmations.block.confirm"
|
||||
}
|
||||
],
|
||||
"path": "app/javascript/mastodon/features/status/index.json"
|
||||
"path": "app/javascript/mastodon/features/ui/components/block_modal.json"
|
||||
},
|
||||
{
|
||||
"descriptors": [
|
||||
|
@ -2569,6 +2525,10 @@
|
|||
"defaultMessage": "Are you sure you want to mute {name}?",
|
||||
"id": "confirmations.mute.message"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts follow you.",
|
||||
"id": "confirmations.mute.explanation"
|
||||
},
|
||||
{
|
||||
"defaultMessage": "Hide notifications from this user?",
|
||||
"id": "mute_modal.hide_notifications"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue