Merge pull request #4009 from LLK/develop

Update release branch with develop changes

package-lock.json

@@ -16190,15 +16190,15 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200514184528",
+      "version": "0.1.0-prerelease.20200520192204",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200514184528.tgz",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200520192204.tgz",
-      "integrity": "sha512-6XG/WEBw5/49WVW9BwPuubcU929M8LntbHquXPpBsYjHpezjuPq9uMurP4pNI0DZDyT9tv3rrynEjwFkotfnXg==",
+      "integrity": "sha512-zo4SPXkR+L2InT8f3EnxvXnerqZM/nsRs8Z9eAV64F3jfs5OCcAtchcp37C3fLkRnQLhu34tcqcz5goLoxrhgA==",
       "dev": true
     },
     "scratch-l10n": {
-      "version": "3.9.20200512220101",
+      "version": "3.9.20200519213537",
-      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200512220101.tgz",
+      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200519213537.tgz",
-      "integrity": "sha512-CAUCdtecNvTIUfcUqp2OEg+pEETVvttHwObnmmV1WPXYjpubI9kHU5wHfmHSeiVj2LduoILrdHOafU1l/KAw0g==",
+      "integrity": "sha512-cpbFrWDcz5y2O2cJFDRsqH5jnvdb1O7k3mkJklF26e5IhL3nWFyFuAKd/o0Q/0HB+U4ZbmMKEGkKFKX1HGYwuw==",
       "dev": true,
       "requires": {
         "@babel/cli": "^7.1.2",

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.20200514184528",
+    "scratch-gui": "0.1.0-prerelease.20200520192204",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

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

@@ -43,14 +43,14 @@ const REPORT_OPTIONS = [
         prompt: <FormattedMessage id="report.promptPlaceholder" />
     },
     {
-        value: '0',
+        value: '19',
-        label: {id: 'report.reasonCopy'},
+        label: {id: 'report.reasonDisrespectful'},
-        prompt: <FormattedMessage id="report.promptCopy" />
+        prompt: (
-    },
+            <div>
-    {
+                <p><FormattedMessage id="report.promptDisrespectful1" /></p>
-        value: '1',
+                <p><FormattedMessage id="report.promptDisrespectful2" /></p>
-        label: {id: 'report.reasonUncredited'},
+            </div>
-        prompt: <FormattedMessage id="report.promptUncredited" />
+        )
     },
     {
         value: '2',
@@ -143,6 +143,16 @@ const REPORT_OPTIONS = [
         label: {id: 'report.reasonPersonal'},
         prompt: <FormattedMessage id="report.promptPersonal" />
     },
+    {
+        value: '0',
+        label: {id: 'report.reasonCopy'},
+        prompt: <FormattedMessage id="report.promptCopy" />
+    },
+    {
+        value: '1',
+        label: {id: 'report.reasonUncredited'},
+        prompt: <FormattedMessage id="report.promptUncredited" />
+    },
     {
         value: '6',
         label: {id: 'general.other'},
@@ -279,8 +289,6 @@ const REPORT_OPTIONS = [
                 )
             }
         ]
-
-
     }
 ];
 

src/l10n.json

@@ -270,6 +270,7 @@
     "report.reasonNoRemixingAllowed": "The project doesn't allow remixing",
     "report.reasonCreatorsSafety": "I'm worried about the safety of the creator of this project",
     "report.reasonSomethingElse": "Something else",
+    "report.reasonDisrespectful": "Mean or Disrespectful to a Scratcher or Group",
     "report.receivedHeader": "We have received your report!",
     "report.receivedBody": "The Scratch Team will review the project based on the Scratch community guidelines.",
     "report.promptPlaceholder": "Select a reason why above.",
@@ -303,12 +304,13 @@
     "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.promptDisrespectful1": "Please let us know why you feel this project is disrespectful to another Scratcher or group. Where does the disrespectful content occur in the project (project text, images, sounds, etc.)?",
+    "report.promptDisrespectful2": "Remember: Scratch welcomes people of all ages, races, ethnicities, religions, abilities, sexual orientations, and gender identities. It’s important everyone feels welcomed and safe when sharing on Scratch.",
     "report.tooLongError": "That's too long! Please find a way to shorten your text.",
     "report.tooShortError": "That's too short. Please describe in detail what's inappropriate or disrespectful about the project.",
     "report.send": "Send",
     "report.sending": "Sending...",
     "report.textMissing": "Please tell us why you are reporting this project",
-
     "comments.delete": "Delete",
     "comments.restore": "Restore",
     "comments.reportModal.title": "Report Comment",