From 52b8dff59a5bed845fe4cfdf2fe5bcdb7ac5abb1 Mon Sep 17 00:00:00 2001 From: seotts Date: Wed, 13 May 2020 11:41:05 -0400 Subject: [PATCH 1/8] Add disrespectful report option, reorder options --- .../modal/report/report-options.jsx | 28 ++++++++++++------- src/l10n.json | 4 ++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/components/modal/report/report-options.jsx b/src/components/modal/report/report-options.jsx index 1d3882960..894ab8f39 100644 --- a/src/components/modal/report/report-options.jsx +++ b/src/components/modal/report/report-options.jsx @@ -43,14 +43,14 @@ const REPORT_OPTIONS = [ prompt: }, { - value: '0', - label: {id: 'report.reasonCopy'}, - prompt: - }, - { - value: '1', - label: {id: 'report.reasonUncredited'}, - prompt: + value: '19', + label: {id: 'report.reasonDisrespectful'}, + prompt: ( +
+

+

+
+ ) }, { value: '2', @@ -143,6 +143,16 @@ const REPORT_OPTIONS = [ label: {id: 'report.reasonPersonal'}, prompt: }, + { + value: '0', + label: {id: 'report.reasonCopy'}, + prompt: + }, + { + value: '1', + label: {id: 'report.reasonUncredited'}, + prompt: + }, { value: '6', label: {id: 'general.other'}, @@ -279,8 +289,6 @@ const REPORT_OPTIONS = [ ) } ] - - } ]; diff --git a/src/l10n.json b/src/l10n.json index 0b80ef54e..4dc24a6d7 100644 --- a/src/l10n.json +++ b/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", From 542cb25c90c39cb414991aeb85856b1924fdcfb6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 May 2020 13:04:08 +0000 Subject: [PATCH 2/8] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200514133224 to 0.1.0-prerelease.20200514184528. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/commits) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6ce35c3f..d11eb5dbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16190,9 +16190,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200514133224", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200514133224.tgz", - "integrity": "sha512-CpHXLi68/2KPSg1LBNlO4Ag4e9Y495bBm+yE2sXddq34qt/LJia4ZQnQ0nee0hLbh5aSmMhypk42+wlT70nuQA==", + "version": "0.1.0-prerelease.20200514184528", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200514184528.tgz", + "integrity": "sha512-6XG/WEBw5/49WVW9BwPuubcU929M8LntbHquXPpBsYjHpezjuPq9uMurP4pNI0DZDyT9tv3rrynEjwFkotfnXg==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index e4b0748e0..439826c75 100644 --- a/package.json +++ b/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.20200514133224", + "scratch-gui": "0.1.0-prerelease.20200514184528", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 02e8e1c772851c5f23368afcdc20951fd9fabc2d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 May 2020 14:26:38 +0000 Subject: [PATCH 3/8] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200514184528 to 0.1.0-prerelease.20200517055834. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/commits/0.1.0-prerelease.20200517055834) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index d11eb5dbe..e0f546439 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16190,9 +16190,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200514184528", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200514184528.tgz", - "integrity": "sha512-6XG/WEBw5/49WVW9BwPuubcU929M8LntbHquXPpBsYjHpezjuPq9uMurP4pNI0DZDyT9tv3rrynEjwFkotfnXg==", + "version": "0.1.0-prerelease.20200517055834", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200517055834.tgz", + "integrity": "sha512-QzzhPnKp1+DDGlNgVoshbRx5MPPgauomnSA0gXRXwdhJ6XVGwT2/iYe9zdMHATUzbwbylzvvTo1f11qGLIZvDw==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index 439826c75..ccf6ccfcd 100644 --- a/package.json +++ b/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.20200517055834", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 61158977bcefb88b922a891cce68e80e02f82c94 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 12:04:10 +0000 Subject: [PATCH 4/8] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200517055834 to 0.1.0-prerelease.20200519024705. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200517055834...0.1.0-prerelease.20200519024705) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0f546439..fbb03d48e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16190,9 +16190,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200517055834", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200517055834.tgz", - "integrity": "sha512-QzzhPnKp1+DDGlNgVoshbRx5MPPgauomnSA0gXRXwdhJ6XVGwT2/iYe9zdMHATUzbwbylzvvTo1f11qGLIZvDw==", + "version": "0.1.0-prerelease.20200519024705", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200519024705.tgz", + "integrity": "sha512-aMdqOl1LDUxAbWu/7jFJTWh1m4oNHw4YvsKBfpPTQuFEhRRarL1zVa80fgGhKRVJghaATDdJwpoisC9Q1kuGAw==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index ccf6ccfcd..4c49c3318 100644 --- a/package.json +++ b/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.20200517055834", + "scratch-gui": "0.1.0-prerelease.20200519024705", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 287d4d931e48df1a057ac99edd44f00eec527433 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 22:04:55 +0000 Subject: [PATCH 5/8] Bump scratch-l10n from 3.9.20200512220101 to 3.9.20200519213537 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200512220101 to 3.9.20200519213537. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/commits) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbb03d48e..02a013f3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16196,9 +16196,9 @@ "dev": true }, "scratch-l10n": { - "version": "3.9.20200512220101", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200512220101.tgz", - "integrity": "sha512-CAUCdtecNvTIUfcUqp2OEg+pEETVvttHwObnmmV1WPXYjpubI9kHU5wHfmHSeiVj2LduoILrdHOafU1l/KAw0g==", + "version": "3.9.20200519213537", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200519213537.tgz", + "integrity": "sha512-cpbFrWDcz5y2O2cJFDRsqH5jnvdb1O7k3mkJklF26e5IhL3nWFyFuAKd/o0Q/0HB+U4ZbmMKEGkKFKX1HGYwuw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From fba6376297cdf1b5d264391a3998911a445cfc04 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 19:08:26 +0000 Subject: [PATCH 6/8] chore(package): update scratch-gui to version 0.1.0-prerelease.20200520185723 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c49c3318..9628c5572 100644 --- a/package.json +++ b/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.20200519024705", + "scratch-gui": "0.1.0-prerelease.20200520185723", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From aa26f7be9d1c8aaa8e286ca5d74136379b516243 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 19:08:30 +0000 Subject: [PATCH 7/8] chore(package): update lockfile package-lock.json --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02a013f3c..8a471bef6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16190,9 +16190,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200519024705", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200519024705.tgz", - "integrity": "sha512-aMdqOl1LDUxAbWu/7jFJTWh1m4oNHw4YvsKBfpPTQuFEhRRarL1zVa80fgGhKRVJghaATDdJwpoisC9Q1kuGAw==", + "version": "0.1.0-prerelease.20200520185723", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200520185723.tgz", + "integrity": "sha512-agld7GrcMPfZCybo1HO8299pYsDvAQ+rd/6SC8kOV9PKEueXB6UaRhpOTVhxUuk+15bq6UMCZTQKZMcq+BWewg==", "dev": true }, "scratch-l10n": { From 6fc311b9dc284903e30067d36ecef4aeb33415c2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 May 2020 19:52:17 +0000 Subject: [PATCH 8/8] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200520185723 to 0.1.0-prerelease.20200520192204. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200520185723...0.1.0-prerelease.20200520192204) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8a471bef6..523083eb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16190,9 +16190,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20200520185723", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200520185723.tgz", - "integrity": "sha512-agld7GrcMPfZCybo1HO8299pYsDvAQ+rd/6SC8kOV9PKEueXB6UaRhpOTVhxUuk+15bq6UMCZTQKZMcq+BWewg==", + "version": "0.1.0-prerelease.20200520192204", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200520192204.tgz", + "integrity": "sha512-zo4SPXkR+L2InT8f3EnxvXnerqZM/nsRs8Z9eAV64F3jfs5OCcAtchcp37C3fLkRnQLhu34tcqcz5goLoxrhgA==", "dev": true }, "scratch-l10n": { diff --git a/package.json b/package.json index 9628c5572..6dbe24469 100644 --- a/package.json +++ b/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.20200520185723", + "scratch-gui": "0.1.0-prerelease.20200520192204", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0",