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
lolsob-rspec
mayaeh 2019-10-01 08:20:22 +09:00 committed by Eugen Rochko
parent ae4b90354d
commit da68736ca3
4 changed files with 43 additions and 78 deletions

View File

@ -238,6 +238,14 @@
"description": "Tooltip of the \"voted\" checkmark in polls", "description": "Tooltip of the \"voted\" checkmark in polls",
"id": "poll.voted" "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", "defaultMessage": "Vote",
"id": "poll.vote" "id": "poll.vote"
@ -245,10 +253,6 @@
{ {
"defaultMessage": "Refresh", "defaultMessage": "Refresh",
"id": "poll.refresh" "id": "poll.refresh"
},
{
"defaultMessage": "{count, plural, one {# vote} other {# votes}}",
"id": "poll.total_votes"
} }
], ],
"path": "app/javascript/mastodon/components/poll.json" "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.", "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" "id": "confirmations.redraft.message"
}, },
{
"defaultMessage": "Block",
"id": "confirmations.block.confirm"
},
{ {
"defaultMessage": "Reply", "defaultMessage": "Reply",
"id": "confirmations.reply.confirm" "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?", "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"id": "confirmations.reply.message" "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" "path": "app/javascript/mastodon/containers/status_container.json"
@ -553,26 +545,14 @@
"defaultMessage": "Unfollow", "defaultMessage": "Unfollow",
"id": "confirmations.unfollow.confirm" "id": "confirmations.unfollow.confirm"
}, },
{
"defaultMessage": "Block",
"id": "confirmations.block.confirm"
},
{ {
"defaultMessage": "Hide entire domain", "defaultMessage": "Hide entire domain",
"id": "confirmations.domain_block.confirm" "id": "confirmations.domain_block.confirm"
}, },
{
"defaultMessage": "Block & Report",
"id": "confirmations.block.block_and_report"
},
{ {
"defaultMessage": "Are you sure you want to unfollow {name}?", "defaultMessage": "Are you sure you want to unfollow {name}?",
"id": "confirmations.unfollow.message" "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.", "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" "id": "confirmations.domain_block.message"
@ -1134,15 +1114,6 @@
], ],
"path": "app/javascript/mastodon/features/compose/components/upload_form.json" "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": [ "descriptors": [
{ {
@ -1635,6 +1606,10 @@
}, },
{ {
"descriptors": [ "descriptors": [
{
"defaultMessage": "Basic",
"id": "home.column_settings.basic"
},
{ {
"defaultMessage": "Show boosts", "defaultMessage": "Show boosts",
"id": "home.column_settings.show_reblogs" "id": "home.column_settings.show_reblogs"
@ -2016,14 +1991,6 @@
"defaultMessage": "Push notifications", "defaultMessage": "Push notifications",
"id": "notifications.column_settings.push" "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", "defaultMessage": "Quick filter bar",
"id": "notifications.column_settings.filter_bar.category" "id": "notifications.column_settings.filter_bar.category"
@ -2082,10 +2049,6 @@
}, },
{ {
"descriptors": [ "descriptors": [
{
"defaultMessage": "and {count, plural, one {# other} other {# others}}",
"id": "notification.and_n_others"
},
{ {
"defaultMessage": "{name} followed you", "defaultMessage": "{name} followed you",
"id": "notification.follow" "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.", "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" "id": "confirmations.redraft.message"
}, },
{
"defaultMessage": "Block",
"id": "confirmations.block.confirm"
},
{ {
"defaultMessage": "Reply", "defaultMessage": "Reply",
"id": "confirmations.reply.confirm" "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?", "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"id": "confirmations.reply.message" "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" "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.", "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" "id": "confirmations.redraft.message"
}, },
{
"defaultMessage": "Block",
"id": "confirmations.block.confirm"
},
{ {
"defaultMessage": "Show more for all", "defaultMessage": "Show more for all",
"id": "status.show_more_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?", "defaultMessage": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
"id": "confirmations.reply.message" "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", "defaultMessage": "Block & Report",
"id": "confirmations.block.block_and_report" "id": "confirmations.block.block_and_report"
}, },
{ {
"defaultMessage": "Toot", "defaultMessage": "Block",
"id": "column.status" "id": "confirmations.block.confirm"
},
{
"defaultMessage": "Are you sure you want to block {name}?",
"id": "confirmations.block.message"
} }
], ],
"path": "app/javascript/mastodon/features/status/index.json" "path": "app/javascript/mastodon/features/ui/components/block_modal.json"
}, },
{ {
"descriptors": [ "descriptors": [
@ -2569,6 +2525,10 @@
"defaultMessage": "Are you sure you want to mute {name}?", "defaultMessage": "Are you sure you want to mute {name}?",
"id": "confirmations.mute.message" "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?", "defaultMessage": "Hide notifications from this user?",
"id": "mute_modal.hide_notifications" "id": "mute_modal.hide_notifications"

View File

@ -63,7 +63,6 @@
"column.notifications": "Notifications", "column.notifications": "Notifications",
"column.pins": "Pinned toots", "column.pins": "Pinned toots",
"column.public": "Federated timeline", "column.public": "Federated timeline",
"column.status": "Toot",
"column_back_button.label": "Back", "column_back_button.label": "Back",
"column_header.hide_settings": "Hide settings", "column_header.hide_settings": "Hide settings",
"column_header.moveLeft_settings": "Move column to the left", "column_header.moveLeft_settings": "Move column to the left",
@ -104,6 +103,7 @@
"confirmations.logout.confirm": "Log out", "confirmations.logout.confirm": "Log out",
"confirmations.logout.message": "Are you sure you want to log out?", "confirmations.logout.message": "Are you sure you want to log out?",
"confirmations.mute.confirm": "Mute", "confirmations.mute.confirm": "Mute",
"confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts follow you.",
"confirmations.mute.message": "Are you sure you want to mute {name}?", "confirmations.mute.message": "Are you sure you want to mute {name}?",
"confirmations.redraft.confirm": "Delete & redraft", "confirmations.redraft.confirm": "Delete & redraft",
"confirmations.redraft.message": "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.", "confirmations.redraft.message": "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.",
@ -174,7 +174,6 @@
"home.column_settings.basic": "Basic", "home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Show boosts", "home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies", "home.column_settings.show_replies": "Show replies",
"home.column_settings.update_live": "Update in real-time",
"intervals.full.days": "{number, plural, one {# day} other {# days}}", "intervals.full.days": "{number, plural, one {# day} other {# days}}",
"intervals.full.hours": "{number, plural, one {# hour} other {# hours}}", "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}", "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@ -268,7 +267,6 @@
"navigation_bar.preferences": "Preferences", "navigation_bar.preferences": "Preferences",
"navigation_bar.public_timeline": "Federated timeline", "navigation_bar.public_timeline": "Federated timeline",
"navigation_bar.security": "Security", "navigation_bar.security": "Security",
"notification.and_n_others": "and {count, plural, one {# other} other {# others}}",
"notification.favourite": "{name} favourited your status", "notification.favourite": "{name} favourited your status",
"notification.follow": "{name} followed you", "notification.follow": "{name} followed you",
"notification.mention": "{name} mentioned you", "notification.mention": "{name} mentioned you",
@ -297,6 +295,7 @@
"notifications.group": "{count} notifications", "notifications.group": "{count} notifications",
"poll.closed": "Closed", "poll.closed": "Closed",
"poll.refresh": "Refresh", "poll.refresh": "Refresh",
"poll.total_people": "{count, plural, one {# person} other {# people}}",
"poll.total_votes": "{count, plural, one {# vote} other {# votes}}", "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
"poll.vote": "Vote", "poll.vote": "Vote",
"poll.voted": "You voted for this answer", "poll.voted": "You voted for this answer",

View File

@ -11,9 +11,14 @@
.dashboard__counters__num= number_with_delimiter @accounts_week .dashboard__counters__num= number_with_delimiter @accounts_week
.dashboard__counters__label= t 'admin.tags.accounts_week' .dashboard__counters__label= t 'admin.tags.accounts_week'
%div %div
= link_to explore_hashtag_path(@tag) do - if @tag.accounts_count > 0
.dashboard__counters__num= number_with_delimiter @tag.accounts_count = link_to explore_hashtag_path(@tag) do
.dashboard__counters__label= t 'admin.tags.directory' .dashboard__counters__num= number_with_delimiter @tag.accounts_count
.dashboard__counters__label= t 'admin.tags.directory'
- else
%div
.dashboard__counters__num= number_with_delimiter @tag.accounts_count
.dashboard__counters__label= t 'admin.tags.directory'
%hr.spacer/ %hr.spacer/

View File

@ -240,6 +240,7 @@ en:
delete: Delete delete: Delete
destroyed_msg: Emojo successfully destroyed! destroyed_msg: Emojo successfully destroyed!
disable: Disable disable: Disable
disabled: Disabled
disabled_msg: Successfully disabled that emoji disabled_msg: Successfully disabled that emoji
emoji: Emoji emoji: Emoji
enable: Enable enable: Enable