From 1cb4514d0e0ed349acbfe72ec87f3187a0cf613a Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Tue, 13 Jun 2023 15:05:40 +0200 Subject: [PATCH] Add missing report category translation (#25400) --- .../mastodon/features/notifications/components/report.jsx | 2 ++ app/javascript/mastodon/locales/en.json | 1 + app/models/report.rb | 1 + 3 files changed, 4 insertions(+) diff --git a/app/javascript/mastodon/features/notifications/components/report.jsx b/app/javascript/mastodon/features/notifications/components/report.jsx index 90412aa3b..cb50b62cd 100644 --- a/app/javascript/mastodon/features/notifications/components/report.jsx +++ b/app/javascript/mastodon/features/notifications/components/report.jsx @@ -8,10 +8,12 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { AvatarOverlay } from 'mastodon/components/avatar_overlay'; import { RelativeTimestamp } from 'mastodon/components/relative_timestamp'; +// This needs to be kept in sync with app/models/report.rb const messages = defineMessages({ openReport: { id: 'report_notification.open', defaultMessage: 'Open report' }, other: { id: 'report_notification.categories.other', defaultMessage: 'Other' }, spam: { id: 'report_notification.categories.spam', defaultMessage: 'Spam' }, + legal: { id: 'report_notification.categories.legal', defaultMessage: 'Legal' }, violation: { id: 'report_notification.categories.violation', defaultMessage: 'Rule violation' }, }); diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 6589d4674..9f7ffad66 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -553,6 +553,7 @@ "report.unfollow": "Unfollow @{name}", "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.", "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached", + "report_notification.categories.legal": "Legal", "report_notification.categories.other": "Other", "report_notification.categories.spam": "Spam", "report_notification.categories.violation": "Rule violation", diff --git a/app/models/report.rb b/app/models/report.rb index 674cc9a27..533e3f72a 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -48,6 +48,7 @@ class Report < ApplicationRecord validate :validate_rule_ids + # entries here needs to be kept in sync with app/javascript/mastodon/features/notifications/components/report.jsx enum category: { other: 0, spam: 1_000,