From eba056979fd0d82a0b97df55d282f80a3e4a50e9 Mon Sep 17 00:00:00 2001 From: diondiondion Date: Wed, 17 Jun 2026 10:41:35 +0200 Subject: [PATCH] Refactor report modal heading translation (#39457) --- .../mastodon/features/report/category.jsx | 14 ++++---------- app/javascript/mastodon/locales/en.json | 7 +++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/javascript/mastodon/features/report/category.jsx b/app/javascript/mastodon/features/report/category.jsx index 539f1d8bda..a6b042ccd6 100644 --- a/app/javascript/mastodon/features/report/category.jsx +++ b/app/javascript/mastodon/features/report/category.jsx @@ -22,8 +22,9 @@ const messages = defineMessages({ 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_description: { id: 'report.reasons.other_description', defaultMessage: 'The issue does not fit into other categories' }, - status: { id: 'report.category.title_status', defaultMessage: 'post' }, - account: { id: 'report.category.title_account', defaultMessage: 'profile' }, + status: { id: 'report.category.title_status', defaultMessage: "Tell us what's going on with this post" }, + 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 => ({ @@ -88,14 +89,7 @@ class Category extends PureComponent { return ( <> - {startedFrom === 'collection' ? ( - - ) : ( - - )} + {intl.formatMessage(messages[startedFrom])}

diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 505f0fc6b6..27012a495d 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -1138,11 +1138,10 @@ "report.categories.spam": "Spam", "report.categories.violation": "Content violates one or more server rules", "report.category.subtitle": "Choose the best match", - "report.category.title": "Tell us what's going on with this {type}", - "report.category.title_account": "profile", - "report.category.title_status": "post", + "report.category.title_account": "Tell us what's going on with this profile", + "report.category.title_collection": "Tell us what's going on with this collection", + "report.category.title_status": "Tell us what's going on with this post", "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.forward": "Forward to {target}", "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",