Merge pull request #3840 from LLK/release/2020-04-30

[Master] Release/2020-04-30

package-lock.json

@@ -15788,9 +15788,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200427175226",
+      "version": "0.1.0-prerelease.20200430160141",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200427175226.tgz",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200430160141.tgz",
-      "integrity": "sha512-D+07MEFzzIL761hSRwJM3B6cXBCLfktl9ywtpu6loS+9KakR/+8csYhmow8U8gK1o25VEtK9Q+tnkNb2OkFmpQ==",
+      "integrity": "sha512-8ml/C49zN+I5oM5Rjtu/C6cDknYrwrOjqQwUlemcYzA3lBP03bPxgHh/Rnug4B+XKMDEwdD5/lm6d4EFDr74Sw==",
       "dev": true
     },
     "scratch-l10n": {

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

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

@@ -55,7 +55,73 @@ const REPORT_OPTIONS = [
     {
         value: '2',
         label: {id: 'report.reasonScary'},
-        prompt: <FormattedMessage id="report.promptScary" />
+        prompt: (
+            <FormattedMessage
+                id="report.promptScary"
+                values={{
+                    CommunityGuidelinesLink: (
+                        <a
+                            href="/community_guidelines"
+                            target="_blank"
+                        >
+                            <FormattedMessage id="general.guidelines" />
+                        </a>
+                    )
+                }}
+            />
+        ),
+        subcategories: [
+            {
+                value: '',
+                label: {id: 'report.reasonPlaceHolder'},
+                prompt: <FormattedMessage id="report.promptPlaceholder" />
+            },
+            {
+                value: '15',
+                label: {id: 'report.reasonJumpscare'},
+                prompt: (
+                    <div>
+                        <p><FormattedMessage id="report.promptJumpscare1" /></p>
+                        <p><FormattedMessage id="report.promptJumpscare2" /></p>
+                    </div>
+                )
+            },
+            {
+                value: '17',
+                label: {id: 'report.reasonWeapons'},
+                prompt: (
+                    <div>
+                        <p><FormattedMessage id="report.promptWeapons1" /></p>
+                        <p><FormattedMessage id="report.promptWeapons2" /></p>
+                    </div>
+                )
+            },
+            {
+                value: '16',
+                label: {id: 'report.reasonEvent'},
+                prompt: (
+                    <div>
+                        <p><FormattedMessage id="report.promptEvent1" /></p>
+                        <p><FormattedMessage id="report.promptEvent2" /></p>
+                    </div>
+                )
+            },
+            {
+                value: '14',
+                label: {id: 'report.reasonScaryImages'},
+                prompt: (
+                    <div>
+                        <p><FormattedMessage id="report.promptScaryImages1" /></p>
+                        <p><FormattedMessage id="report.promptScaryImages2" /></p>
+                    </div>
+                )
+            },
+            {
+                value: '18',
+                label: {id: 'report.reasonThreatening'},
+                prompt: <FormattedMessage id="report.promptThreatening" />
+            }
+        ]
     },
     {
         value: '3',

src/l10n.json

@@ -251,6 +251,11 @@
     "report.reasonCopy": "Exact Copy of Project",
     "report.reasonUncredited": "Uses Image/Music Without Credit",
     "report.reasonScary": "Too Violent or Scary",
+    "report.reasonJumpscare": "Jumpscare",
+    "report.reasonWeapons": "Uses realistic weapons",
+    "report.reasonEvent": "Violent event happens",
+    "report.reasonScaryImages": "Scary images",
+    "report.reasonThreatening": "Threatens or bullies another Scratcher",
     "report.reasonLanguage": "Inappropriate Language",
     "report.reasonMusic": "Inappropriate Music",
     "report.reasonMissing": "Please select a reason",
@@ -270,7 +275,16 @@
     "report.promptPlaceholder": "Select a reason why above.",
     "report.promptCopy": "Please provide a link to the original project",
     "report.promptUncredited": "Please provide links to the uncredited content",
-    "report.promptScary": "Please say why the project is too violent or scary",
+    "report.promptScary": "Please select the main reason why you feel this project may break the {CommunityGuidelinesLink}.",
+    "report.promptJumpscare1": "A \"jumpscare\" is when something unexpected flashes on the screen with the intent to scare someone.",
+    "report.promptJumpscare2": "Please let us know more about the \"jumpscare,\" such as what happens, and when does it happen in the project. Also, providing the name of the sprite, costume, or backdrop, associated with the jumpscare is helpful.",
+    "report.promptWeapons1": "Please let us know where the image, drawing, or sound of realistic weapons occurs in the project, such as the name of the sprite, costume, or backdrop.",
+    "report.promptWeapons2": "Tip: Scratch projects should not contain realistic weapons, such as photographs of guns, realistic drawings or sounds. However, cartoon or fictional items like laser beams are okay.",
+    "report.promptEvent1": "Please let us know more about the scary event or story in the project. Providing more details will help the Scratch Team better understand the issue and address it.",
+    "report.promptEvent2": "Tip: Scratch is used by all people of ages. It’s important projects do not contain mature themes such as harming someone.",
+    "report.promptScaryImages1": "Please let us know why you feel this image is too scary for Scratch, and where the image occurs in the project, such as the name of the sprite, costume, or backdrop.",
+    "report.promptScaryImages2": "Tip: Scratch is used by all people of ages. It’s important projects do not contain blood, realistic violence, or anything that may feel scary or too mature for younger audiences.",
+    "report.promptThreatening": "Please let us know why you feel this project is threatening another Scratcher.",
     "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.)",

src/views/credits/people.json

@@ -233,5 +233,10 @@
         "userName": "pondermake",
         "userId": 26779669,
         "name": "Kathy"
+    },
+    {
+        "userName": "MunchtheCat",
+        "userId": 59383434,
+        "name": "Kait"
     }
 ]

src/views/splash/presentation.jsx

@@ -65,10 +65,10 @@ class ActivityList extends React.Component {
             return (
                 <FollowStudioMessage
                     followDateTime={message.datetime_created}
-                    followeeId={message.gallery_id}
+                    followerUsername={message.actor_username}
                     key={key}
+                    studioId={message.gallery_id}
                     studioTitle={message.title}
-                    studioUsername={message.actor_username}
                 />
             );
         case 'loveproject':