Merge pull request #3793 from LLK/release/2020-04-09

[MASTER] Release 2020-04-09

package.json

@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200325184934",
+    "scratch-gui": " 0.1.0-prerelease.20200409194558",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

src/components/modal/report/modal.jsx

@@ -132,7 +132,7 @@ class ReportModal extends React.Component {
                                                     href="/community_guidelines"
                                                     target="_blank"
                                                 >
-                                                    <FormattedMessage id="report.CommunityGuidelinesLinkText" />
+                                                    <FormattedMessage id="general.guidelines" />
                                                 </a>
                                             )
                                         }}

src/components/modal/report/report-options.jsx

@@ -80,7 +80,21 @@ const REPORT_OPTIONS = [
     {
         value: '6',
         label: {id: 'general.other'},
-        prompt: <FormattedMessage id="report.promptGuidelines" />,
+        prompt: (
+            <FormattedMessage
+                id="report.promptGuidelines"
+                values={{
+                    CommunityGuidelinesLink: (
+                        <a
+                            href="/community_guidelines"
+                            target="_blank"
+                        >
+                            <FormattedMessage id="general.guidelines" />
+                        </a>
+                    )
+                }}
+            />
+        ),
         subcategories: [
             {
                 value: '',
@@ -110,6 +124,12 @@ const REPORT_OPTIONS = [
                     <div>
                         <p><FormattedMessage id="report.promptDoesntWork" /></p>
                         <p><FormattedMessage id="report.promptDoesntWorkTips" /></p>
+                        <p><FormattedMessage id="report.promptTips" /></p>
+                        <ul>
+                            <li><FormattedMessage id="report.tipsSupportive" /></li>
+                            <li><FormattedMessage id="report.tipsConstructive" /></li>
+                            <li><FormattedMessage id="report.tipsSpecific" /></li>
+                        </ul>
                     </div>
                 ),
                 preventSubmission: true
@@ -133,7 +153,17 @@ const REPORT_OPTIONS = [
             {
                 value: 'report.reasonTooHard',
                 label: {id: 'report.reasonTooHard'},
-                prompt: <FormattedMessage id="report.promptTooHard" />,
+                prompt: (
+                    <div>
+                        <p><FormattedMessage id="report.promptTooHard" /></p>
+                        <p><FormattedMessage id="report.promptTips" /></p>
+                        <ul>
+                            <li><FormattedMessage id="report.tipsSupportive" /></li>
+                            <li><FormattedMessage id="report.tipsConstructive" /></li>
+                            <li><FormattedMessage id="report.tipsSpecific" /></li>
+                        </ul>
+                    </div>
+                ),
                 preventSubmission: true
             },
             {

src/l10n.json

@@ -247,7 +247,7 @@
     "thumbnail.by": "by",
     "report.error": "Something went wrong when trying to send your message. Please try again.",
     "report.project": "Report Project",
-    "report.projectInstructions": "From the dropdown below, please select the reason why you feel this project is disrespectful or inappropriate or otherwise breaks the {CommunityGuidelinesLink}.",
+    "report.projectInstructions": "When you send a report, it lets the Scratch Team know about projects that break the {CommunityGuidelinesLink}. Does something in this project break the {CommunityGuidelinesLink}? If you think it does, please tell us more.",
     "report.CommunityGuidelinesLinkText": "Scratch Community Guidelines",
     "report.reasonPlaceHolder": "Select a reason",
     "report.reasonCopy": "Exact Copy of Project",
@@ -276,7 +276,7 @@
     "report.promptLanguage": "Please say where the inappropriate language occurs in the project (For example: Notes & Credits, sprite name, project text, etc.)",
     "report.promptMusic": "Please say the name of the audio file with the inappropriate music",
     "report.promptPersonal": "Please say where the personal contact information is shared (For example: Notes & Credits, sprite name, project text, etc.)",
-    "report.promptGuidelines": "Please be specific about why this project does not follow our Community Guidelines",
+    "report.promptGuidelines": "Please select a reason why you feel this project may break the {CommunityGuidelinesLink} and the Scratch Team will review your report.",
     "report.promptImage": "Please say the name of the sprite or the backdrop with the inappropriate image",
     "report.promptDontLikeIt": "Scratch projects are made by people of all ages and levels of experience. If you don't like this project because you feel it can be improved upon, we encourage you to share constructive feedback directly with the creator.",
     "report.promptTips": "Here are tips on sharing constructive feedback:",
@@ -287,8 +287,8 @@
     "report.promptDoesntWorkTips": "We encourage you to share any issues you discover directly with the creator of the project. It's also helpful to provide suggestions on how they may improve their project, if possible.",
     "report.promptTooHard": "If you feel a project could be easier, we encourage you to share that feedback directly with the creator of the project. Or remix it yourself and make it as easy or hard as you like!",
     "report.promptMisleading": "Tell us more about how it's tricking or misleading people",
-    "report.promptFaceReveal": "Scratch allows people to use pictures of their face in creative projects like games, stories, or animations. However, projects that are just a picture of their face, or which focus entirely on their physical appearance, aren't allowed on Scratch. If this is a \"face reveal,\" or the project focuses on the person's appearance, please click \"{send}.\"",
+    "report.promptFaceReveal": "Scratch allows people to use pictures of their face in creative projects like games, stories, or animations. However, Scratch does not allow users to share projects which are just a picture of their face (known as a “face reveal”) or which focus entirely on their physical appearance. Please explain if you feel this project is a face reveal or focuses on the person's physical appearance.",
-    "report.promptNoRemixingAllowed": "Please let us know where the project says it is not okay to remix — such as in the Notes & Credits, project title, etc.  ",
+    "report.promptNoRemixingAllowed": "Please let us know where the project says it is not okay to remix — such as in the Notes & Credits, project title, etc.",
     "report.promptCreatorsSafety": "It's important that everyone on Scratch remains safe online and in real life. Please let us know why you are worried about the safety of this user.",
     "report.promptSomethingElse": "We encourage you to double check if your report fits any of the other available categories. If you strongly feel it does not, please explain why this project breaks the {CommunityGuidelinesLink}.",
     "report.tooLongError": "That's too long! Please find a way to shorten your text.",