diff --git a/client/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx b/client/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx index ba4604a500..fcb7769c4f 100644 --- a/client/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx +++ b/client/src/core/client/admin/components/ModerateCard/FlagDetailsContainer.tsx @@ -81,7 +81,7 @@ const FlagDetailsContainer: FunctionComponent = ({ - Illegal content + Potentially illegal content } nodes={illegalContent} diff --git a/client/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx b/client/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx index 7d9cb49a7e..1ed3f0d693 100644 --- a/client/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx +++ b/client/src/core/client/admin/components/ModerateCard/MarkersContainer.tsx @@ -195,7 +195,7 @@ const markers: Array< (c.revision && c.revision.actionCounts.illegal.total > 0 && ( - Illegal content + Potentially illegal content {" "} {c.revision.actionCounts.illegal.total} diff --git a/client/src/core/client/admin/routes/Reports/ReportHistory.tsx b/client/src/core/client/admin/routes/Reports/ReportHistory.tsx index 1cda45a78a..cceb7f9ad5 100644 --- a/client/src/core/client/admin/routes/Reports/ReportHistory.tsx +++ b/client/src/core/client/admin/routes/Reports/ReportHistory.tsx @@ -259,7 +259,7 @@ const ReportHistory: FunctionComponent = ({ >
{`${h.createdBy?.username} made a decision that this report contains illegal content`}
+ >{`${h.createdBy?.username} made a decision that this report contains potentially illegal content`} ) : ( = ({ >
{`${h.createdBy?.username} made a decision that this report does not contain illegal content`}
+ >{`${h.createdBy?.username} made a decision that this report does not contain potentially illegal content`}
)} {h.decision?.legality === "ILLEGAL" && ( diff --git a/client/src/core/client/admin/routes/Reports/ReportMakeDecisionModal.tsx b/client/src/core/client/admin/routes/Reports/ReportMakeDecisionModal.tsx index 7ba1d7b80d..67b8195a5c 100644 --- a/client/src/core/client/admin/routes/Reports/ReportMakeDecisionModal.tsx +++ b/client/src/core/client/admin/routes/Reports/ReportMakeDecisionModal.tsx @@ -112,7 +112,8 @@ const ReportMakeDecisionModal: FunctionComponent = ({
- Does this comment appear to contain illegal content? + Does this comment appear to contain potentially + illegal content?
diff --git a/client/src/core/client/admin/routes/Reports/SingleReportRoute.tsx b/client/src/core/client/admin/routes/Reports/SingleReportRoute.tsx index e1c1ac8e29..203a17e6a6 100644 --- a/client/src/core/client/admin/routes/Reports/SingleReportRoute.tsx +++ b/client/src/core/client/admin/routes/Reports/SingleReportRoute.tsx @@ -265,7 +265,8 @@ const SingleReportRoute: FunctionComponent & {
- Does this comment contain illegal content? + Does this comment contain potentially illegal + content?
{dsaReport.decision.legality === diff --git a/client/src/core/client/admin/test/dsaReports/dsaReportsSingle.spec.tsx b/client/src/core/client/admin/test/dsaReports/dsaReportsSingle.spec.tsx index 2f005b822b..f6f6d176af 100644 --- a/client/src/core/client/admin/test/dsaReports/dsaReportsSingle.spec.tsx +++ b/client/src/core/client/admin/test/dsaReports/dsaReportsSingle.spec.tsx @@ -259,7 +259,7 @@ it("can make a legality decision on a report", async () => { userEvent.click(submitButton); expect( await within(container).findByText( - "Markus made a decision that this report contains illegal content" + "Markus made a decision that this report contains potentially illegal content" ) ); }); diff --git a/client/src/core/client/stream/tabs/Comments/Comment/ArchivedReportFlow/ArchivedReportFlowContainer.tsx b/client/src/core/client/stream/tabs/Comments/Comment/ArchivedReportFlow/ArchivedReportFlowContainer.tsx index d669c2435d..3b22a00f7d 100644 --- a/client/src/core/client/stream/tabs/Comments/Comment/ArchivedReportFlow/ArchivedReportFlowContainer.tsx +++ b/client/src/core/client/stream/tabs/Comments/Comment/ArchivedReportFlow/ArchivedReportFlowContainer.tsx @@ -111,7 +111,7 @@ const ArchivedReportFlowContainer: FunctionComponent = ({ href={reportLink} > - This comment contains illegal content + This comment contains potentially illegal content = ({ href={reportLink} > - This comment contains illegal content + This comment contains potentially illegal content diff --git a/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/AdditionalCommentQuery.tsx b/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/AdditionalCommentQuery.tsx index 303e1df967..77ef70c4bb 100644 --- a/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/AdditionalCommentQuery.tsx +++ b/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/AdditionalCommentQuery.tsx @@ -34,7 +34,7 @@ export const render = ( const previouslyReportedError = getMessage( localeBundles, "comments-permalinkView-reportIllegalContent-additionalComments-previouslyReportedCommentError", - "You've previously reported this comment for containing illegal content. You may only report a comment for this reason one time." + "You've previously reported this comment for containing potentially illegal content. You may only report a comment for this reason one time." ); onAddCommentError(previouslyReportedError, additionalComment.id); return null; diff --git a/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/IllegalContentReportViewContainer.tsx b/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/IllegalContentReportViewContainer.tsx index f9729c5276..c18106e61c 100644 --- a/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/IllegalContentReportViewContainer.tsx +++ b/client/src/core/client/stream/tabs/Comments/IllegalContentReportView/IllegalContentReportViewContainer.tsx @@ -225,7 +225,7 @@ const IllegalContentReportViewContainer: FunctionComponent = (props) => {
Your report will now be reviewed by our moderation team. You will receive a notification once a decision is made. - If the content is found to contain illegal content, it + If the content is found to contain potentially illegal will be removed from the site and further action may be taken against the commenter.
@@ -246,8 +246,8 @@ const IllegalContentReportViewContainer: FunctionComponent = (props) => {
Your report will now be reviewed by our moderation team and you will receive a notification once a decision is - made. If the content is found to contain illegal content, - it will be removed from our site. + made. If the content is found to contain potentially + illegal content it will be removed from our site.
diff --git a/client/src/core/client/stream/tabs/Notifications/DSAReportDecisionMadeNotificationBody.tsx b/client/src/core/client/stream/tabs/Notifications/DSAReportDecisionMadeNotificationBody.tsx index 70ab318669..0478a3dee0 100644 --- a/client/src/core/client/stream/tabs/Notifications/DSAReportDecisionMadeNotificationBody.tsx +++ b/client/src/core/client/stream/tabs/Notifications/DSAReportDecisionMadeNotificationBody.tsx @@ -38,10 +38,13 @@ const DSAReportDecisionMadeNotificationBody: FunctionComponent = ({ > On {date} you reported a comment written by{" "} - {username} for containing illegal content. After - reviewing your report, our moderation team has decide this comment{" "} - does not appear to contain illegal content. Thank - you for helping to keep our community safe. + {username} for containing potentially illegal + content. After reviewing your report, our moderation team has + decided this comment{" "} + + does not appear to contain potentially illegal content. + {" "} + Thank you for helping to keep our community safe. )} @@ -57,9 +60,10 @@ const DSAReportDecisionMadeNotificationBody: FunctionComponent = ({ > On {date} you reported a comment written by{" "} - {username} for containing illegal content. After - reviewing your report, our moderation team has decided this - comment does contain illegal content and has been + {username} for containing potentially illegal + content. After reviewing your report, our moderation team has + decided this comment{" "} + does contain potentially illegal content and has removed. Further action may be taken against the commenter, however you will not be notified of any additional steps. Thank you for helping to keep our community safe. diff --git a/client/src/core/client/stream/tabs/Notifications/RejectedCommentNotificationBody.tsx b/client/src/core/client/stream/tabs/Notifications/RejectedCommentNotificationBody.tsx index ac9d4a36cb..0264455311 100644 --- a/client/src/core/client/stream/tabs/Notifications/RejectedCommentNotificationBody.tsx +++ b/client/src/core/client/stream/tabs/Notifications/RejectedCommentNotificationBody.tsx @@ -97,7 +97,7 @@ const getGeneralReason = ( return getMessage( bundles, "notifications-rejectionReason-illegalContent", - "This comment contains illegal content" + "This comment contains potentially illegal content" ); } diff --git a/client/src/core/client/stream/test/comments/permalink/reportIllegalContentView.spec.tsx b/client/src/core/client/stream/test/comments/permalink/reportIllegalContentView.spec.tsx index ad9dde4f6d..ad23dcdb40 100644 --- a/client/src/core/client/stream/test/comments/permalink/reportIllegalContentView.spec.tsx +++ b/client/src/core/client/stream/test/comments/permalink/reportIllegalContentView.spec.tsx @@ -111,7 +111,7 @@ beforeEach(async () => { it("includes and submits report illegal content form", async () => { await createTestRenderer(); - await screen.findByText("Report illegal content"); + await screen.findByText("Report potentially illegal content"); const currentTab = screen.getByTestId("current-tab-pane"); const lawBrokenTextbox = within(currentTab).getByRole("textbox", { diff --git a/client/src/core/client/stream/test/comments/stream/reportComment.spec.tsx b/client/src/core/client/stream/test/comments/stream/reportComment.spec.tsx index 59284fe0aa..7e1ec3abd7 100644 --- a/client/src/core/client/stream/test/comments/stream/reportComment.spec.tsx +++ b/client/src/core/client/stream/test/comments/stream/reportComment.spec.tsx @@ -205,7 +205,7 @@ it("report comment includes link to report illegal content", async () => { userEvent.click(reportButton); const form = within(comment).getByTestId("report-comment-form"); const reportIllegalContentButton = within(form).getByRole("link", { - name: "This comment contains illegal content share-external-link-1", + name: "This comment contains potentially illegal content share-external-link-1", }); expect(reportIllegalContentButton).toHaveAttribute( "href", @@ -223,7 +223,7 @@ it("can report illegal content when not signed in", async () => { userEvent.click(reportButton); const form = within(comment).getByTestId("report-comment-form"); const reportIllegalContentButton = within(form).getByRole("link", { - name: "This comment contains illegal content share-external-link-1", + name: "This comment contains potentially illegal content share-external-link-1", }); expect(reportIllegalContentButton).toHaveAttribute( "href", diff --git a/locales/en-US/admin.ftl b/locales/en-US/admin.ftl index 6652faf9fa..acd6313c51 100644 --- a/locales/en-US/admin.ftl +++ b/locales/en-US/admin.ftl @@ -1052,7 +1052,7 @@ moderate-marker-preMod = Pre-mod moderate-marker-link = Link moderate-marker-bannedWord = Banned word moderate-marker-bio = Bio -moderate-marker-illegal = Illegal content +moderate-marker-illegal = Potentially illegal content moderate-marker-possibleBannedWord = Possible Banned Word moderate-marker-suspectWord = Suspect word moderate-marker-possibleSuspectWord = Possible Suspect Word @@ -1075,7 +1075,7 @@ moderate-flagDetails-abusive = Abusive moderate-flagDetails-spam = Spam moderate-flagDetails-bio = Bio moderate-flagDetails-other = Other -moderate-flagDetails-illegalContent = Illegal content +moderate-flagDetails-illegalContent = Potentially illegal content moderate-flagDetails-viewDSAReport = View DSA Report moderate-card-flag-details-anonymousUser = Anonymous user @@ -1954,8 +1954,8 @@ reports-singleReport-history = History reports-singleReport-history-reportSubmitted = Illegal content report submitted reports-singleReport-history-addedNote = { $username } added a note reports-singleReport-history-deleteNoteButton = Delete -reports-singleReport-history-madeDecision-illegal = { $username } made a decision that this report contains illegal content -reports-singleReport-history-madeDecision-legal = { $username } made a decision that this report does not contain illegal content +reports-singleReport-history-madeDecision-illegal = { $username } made a decision that this report contains potentially illegal content +reports-singleReport-history-madeDecision-legal = { $username } made a decision that this report does not contain potentially illegal content reports-singleReport-history-legalGrounds = Legal grounds: { $legalGrounds } reports-singleReport-history-explanation = Explanation: { $explanation } reports-singleReport-history-changedStatus = { $username } changed status to { $status } @@ -1968,7 +1968,7 @@ reports-singleReport-decisionLabel = Decision reports-singleReport-decision-legalGrounds = Legal grounds reports-singleReport-decision-explanation = Detailed explanation reports-singleReport-makeDecisionButton = Decision -reports-singleReport-decision-doesItContain = Does this comment contain illegal content? +reports-singleReport-decision-doesItContain = Does this comment contain potentially illegal content? reports-singleReport-decision-doesItContain-yes = Yes reports-singleReport-decision-doesItContain-no = No @@ -1986,7 +1986,7 @@ reports-changeStatusModal-dontUpdateButton = No reports-changeStatusModal-header = Update status? reports-decisionModal-header = Report decision -reports-decisionModal-prompt = Does this comment appear to contain illegal content? +reports-decisionModal-prompt = Does this comment appear to contain potentially illegal content? reports-decisionModal-yes = Yes reports-decisionModal-no = No reports-decisionModal-submit = Submit diff --git a/locales/en-US/stream.ftl b/locales/en-US/stream.ftl index cc2cfa9466..c1998cb455 100644 --- a/locales/en-US/stream.ftl +++ b/locales/en-US/stream.ftl @@ -158,13 +158,13 @@ comments-permalinkView-section = comments-permalinkView-viewFullDiscussion = View full discussion comments-permalinkView-commentRemovedOrDoesNotExist = This comment has been removed or does not exist. -comments-permalinkView-reportIllegalContent-title = Report illegal content +comments-permalinkView-reportIllegalContent-title = Report potentially illegal content comments-permalinkView-reportIllegalContent-description = Please fill this form out to the best of your ability so our moderation team can make a decision and if necessary consult with our site's legal department. comments-permalinkView-reportIllegalContent-reportingComment = You are reporting this comment comments-permalinkView-reportIllegalContent-lawBrokenDescription-inputLabel = What law do you believe has been broken? (required) comments-permalinkView-reportIllegalContent-additionalInformation-inputLabel = Please include additional information why this comment is illegal (required) comments-permalinkView-reportIllegalContent-additionalInformation-helperText = Any detail you include will help us investigate this further -comments-permalinkView-reportIllegalContent-additionalComments-inputLabel = Would you like to report any other comments for containing illegal content? +comments-permalinkView-reportIllegalContent-additionalComments-inputLabel = Would you like to report any other comments for containing potentially illegal content? comments-permalinkView-reportIllegalContent-bonafideBelief-checkbox = I believe that the information included in this report is accurate and complete comments-permalinkView-reportIllegalContent-additionalComments-addCommentURLButton = Add comments-permalinkView-reportIllegalContent-additionalComment-commentURLButton = Comment URL @@ -174,10 +174,10 @@ comments-permalinkView-reportIllegalContent-additionalComments-commentNotFoundEr comments-permalinkView-reportIllegalContent-additionalComments-validCommentURLError = This is not a valid URL. Please enter a valid comment URL comments-permalinkView-reportIllegalContent-additionalComments-uniqueCommentURLError = You've already added this comment to this report. Please add a unique comment URL comments-permalinkView-reportIllegalContent-additionalComments-validCommentURLLengthError = Additional comment URL length exceeds maximum. -comments-permalinkView-reportIllegalContent-additionalComments-previouslyReportedCommentError = You've previously reported this comment for containing illegal content. You may only report a comment for this reason one time. +comments-permalinkView-reportIllegalContent-additionalComments-previouslyReportedCommentError = You've previously reported this comment for containing potentially illegal content. You may only report a comment for this reason one time. comments-permalinkView-reportIllegalContent-confirmation-successHeader = We have received your illegal content report comments-permalinkView-reportIllegalContent-confirmation-description = Your report will now be reviewed by our moderation team. You will receive a notification once a decision is made. If the content is - found to contain illegal content, it will be removed from the site and further action may be taken against the commenter. + found to contain potentially illegal content, it will be removed from the site and further action may be taken against the commenter. comments-permalinkView-reportIllegalContent-confirmation-errorHeader = Thank you for submitting this report comments-permalinkView-reportIllegalContent-confirmation-errorDescription = We were unable to submit your report for the following reason(s): comments-permalinkView-reportIllegalContent-confirmation-returnToComments = You may now close this tab to return to the comments @@ -766,7 +766,7 @@ comments-reportPopover-receivedMessage = comments-reportPopover-dismiss = Dismiss -comments-reportForm-reportIllegalContent-button = This comment contains illegal content +comments-reportForm-reportIllegalContent-button = This comment contains potentially illegal content comments-reportForm-signInToReport = You have to sign in to report a comment that violates our guidelines ## Archived Report Comment Popover @@ -1097,7 +1097,7 @@ notifications-repliedComment-hideOriginalComment = - Hide my original comment notifications-repliedComment-showOriginalComment = + Show my original comment notifications-dsaReportLegality-legal = Legal content -notifications-dsaReportLegality-illegal = Illegal content +notifications-dsaReportLegality-illegal = Potentially illegal content notifications-dsaReportLegality-unknown = Unknown notifications-rejectionReason-offensive = This comment contains offensive language @@ -1105,7 +1105,7 @@ notifications-rejectionReason-abusive = This comment contains abusive language notifications-rejectionReason-spam = This comment is spam notifications-rejectionReason-bannedWord = Banned word notifications-rejectionReason-ad = This comment is an advertisement -notifications-rejectionReason-illegalContent = This comment contains illegal content +notifications-rejectionReason-illegalContent = This comment contains potentially illegal content notifications-rejectionReason-harassmentBullying = This comment contains harassing or bullying language notifications-rejectionReason-misinformation = This comment contains misinformation notifications-rejectionReason-hateSpeech = This comment contains hate speech @@ -1115,9 +1115,9 @@ notifications-rejectionReason-other-customReason = Other - { $customReason } notifications-rejectionReason-unknown = Unknown notifications-reportDecisionMade-legal = - On { $date } you reported a comment written by { $author } for containing illegal content. After reviewing your report, our moderation team has decided this comment does not appear to contain illegal content. Thank you for helping to keep our community safe. + On { $date } you reported a comment written by { $author } for containing potentially illegal content. After reviewing your report, our moderation team has decided this comment does not appear to contain illegal content. Thank you for helping to keep our community safe. notifications-reportDecisionMade-illegal = - On { $date } you reported a comment written by { $author } for containing illegal content. After reviewing your report, our moderation team has decided this comment does contain illegal content and has been removed. Further action may be taken against the commenter, however you will not be notified of any additional steps. Thank you for helping to keep our community safe. + On { $date } you reported a comment written by { $author } for containing potentially illegal content. After reviewing your report, our moderation team has decided this comment does contain illegal content and has been removed. Further action may be taken against the commenter, however you will not be notified of any additional steps. Thank you for helping to keep our community safe. notifications-methodOfRedress-none = All moderation decisions are final and cannot be appealed diff --git a/server/src/core/server/locales/en-US/common.ftl b/server/src/core/server/locales/en-US/common.ftl index ec4f48384b..b31d45f4c4 100644 --- a/server/src/core/server/locales/en-US/common.ftl +++ b/server/src/core/server/locales/en-US/common.ftl @@ -58,7 +58,7 @@ notifications-illegalContentReportReviewed-decision-illegal = notifications-illegalContentReportReviewed-description = On { $date } you reported a comment written by { $author } for - containing illegal content. After reviewing your report, our moderation + containing potentially illegal content. After reviewing your report, our moderation team has decided this comment { $decision }. notifications-commentRejected-title = @@ -88,7 +88,7 @@ notification-reasonForRemoval-spam = Spam notification-reasonForRemoval-bannedWord = Banned word notification-reasonForRemoval-ad = Ad notification-reasonForRemoval-other = Other -notification-reasonForRemoval-illegal = Illegal content +notification-reasonForRemoval-illegal = Potentially illegal content notification-reasonForRemoval-unknown = Unknown notifications-commentRejected-details-notFound = diff --git a/server/src/core/server/locales/en-US/errors.ftl b/server/src/core/server/locales/en-US/errors.ftl index d7ee8f9483..cb548702bc 100644 --- a/server/src/core/server/locales/en-US/errors.ftl +++ b/server/src/core/server/locales/en-US/errors.ftl @@ -22,7 +22,7 @@ error-duplicateUser = Specified user already exists with a different login method. error-duplicateEmail = Specified email address is already in use. error-duplicateEmailDomain = Specified email domain is already configured. -error-duplicateDSAReport = User has already reported this comment for illegal content. +error-duplicateDSAReport = User has already reported this comment for potentially illegal content. error-localProfileAlreadySet = Specified account already has a password set. error-localProfileNotSet =