tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor report modal heading translation (#39457)

Browse Source
This commit is contained in:
diondiondion 2026-06-17 10:41:35 +02:00 committed by Claire
parent a5fd36e95c
commit eba056979f
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/mastodon/features/report/category.jsx
View File

@ -22,8 +22,9 @@ const messages = defineMessages({
violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' }, violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' },
other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' }, other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' },
other_description: { id: 'report.reasons.other_description', defaultMessage: 'The issue does not fit into other categories' }, other_description: { id: 'report.reasons.other_description', defaultMessage: 'The issue does not fit into other categories' },
status: { id: 'report.category.title_status', defaultMessage: 'post' }, status: { id: 'report.category.title_status', defaultMessage: "Tell us what's going on with this post" },
account: { id: 'report.category.title_account', defaultMessage: 'profile' }, account: { id: 'report.category.title_account', defaultMessage: "Tell us what's going on with this profile" },
collection: { id: 'report.category.title_collection', defaultMessage: "Tell us what's going on with this collection"}
}); });
const mapStateToProps = state => ({ const mapStateToProps = state => ({
@ -88,14 +89,7 @@ class Category extends PureComponent {
return ( return (
<> <>
<NavigationFocusTarget as='h1' className='report-dialog-modal__title'> <NavigationFocusTarget as='h1' className='report-dialog-modal__title'>
{startedFrom === 'collection' ? ( {intl.formatMessage(messages[startedFrom])}
<FormattedMessage
id='report.collection_comment'
defaultMessage='Why do you want to report this collection?'
/>
) : (
<FormattedMessage id='report.category.title' defaultMessage="Tell us what's going on with this {type}" values={{ type: intl.formatMessage(messages[startedFrom]) }} />
)}
</NavigationFocusTarget> </NavigationFocusTarget>
<p className='report-dialog-modal__lead'><FormattedMessage id='report.category.subtitle' defaultMessage='Choose the best match' /></p> <p className='report-dialog-modal__lead'><FormattedMessage id='report.category.subtitle' defaultMessage='Choose the best match' /></p>

7
app/javascript/mastodon/locales/en.json
View File

@ -1138,11 +1138,10 @@
"report.categories.spam": "Spam", "report.categories.spam": "Spam",
"report.categories.violation": "Content violates one or more server rules", "report.categories.violation": "Content violates one or more server rules",
"report.category.subtitle": "Choose the best match", "report.category.subtitle": "Choose the best match",
"report.category.title": "Tell us what's going on with this {type}", "report.category.title_account": "Tell us what's going on with this profile",
"report.category.title_account": "profile", "report.category.title_collection": "Tell us what's going on with this collection",
"report.category.title_status": "post", "report.category.title_status": "Tell us what's going on with this post",
"report.close": "Done", "report.close": "Done",
"report.collection_comment": "Why do you want to report this collection?",
"report.comment.title": "Is there anything else you think we should know?", "report.comment.title": "Is there anything else you think we should know?",
"report.forward": "Forward to {target}", "report.forward": "Forward to {target}",
"report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?", "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",