From 9ef92c3a9dbc39ad1aa498eaacd9a6664ba4c418 Mon Sep 17 00:00:00 2001 From: WorldLanguages Date: Tue, 16 Dec 2025 18:40:23 -0300 Subject: [PATCH] Revert "Add "Cat blocks" pre-send warning to feedback page (#556)" This reverts commit 56ac05f7b01792c73548e98ef5162874c3afdd60. --- i18n/en.yaml | 6 +++--- layouts/shortcodes/specifics/feedback-form.html | 6 +++--- static/assets/js/feedback.js | 16 ++++------------ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/i18n/en.yaml b/i18n/en.yaml index ebe775cb9..f124bc6bc 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -183,9 +183,9 @@ FeedbackPage: Punishment: Heading: We can't punish people. We are not the Scratch Team. Description: "Scratch Addons is not affiliated with the Scratch website or the organizations that maintain it. We have no control of the content and the moderation on the Scratch website. {{ .Tag1Start }}There are many ways that you can report on the Scratch website.{{ .Tag1End }}" - Catblocks: - Heading: To solve the issue, disable the Cat Blocks feature - Description: We are working on it. In the meanwhile, go to Scratch Addons settings and search for Cat Blocks, then disable it. + Folders: + Heading: The Sprite Folders feature will be fixed soon! + Description: We are working on it # Strings used for /scratch-messaging-transition SMTPage: diff --git a/layouts/shortcodes/specifics/feedback-form.html b/layouts/shortcodes/specifics/feedback-form.html index 99fa0cd58..02b42a95a 100644 --- a/layouts/shortcodes/specifics/feedback-form.html +++ b/layouts/shortcodes/specifics/feedback-form.html @@ -19,9 +19,9 @@ heading: '{{ T "FeedbackPage.PreSendWarning.Variations.Punishment.Heading" }}', description: '{{ T "FeedbackPage.PreSendWarning.Variations.Punishment.Description" ( dict "Tag1Start" (add $ts 1) "Tag1End" (add $ts 2) ) | htmlEscape }}', }, - catblocks: { - heading: '{{ T "FeedbackPage.PreSendWarning.Variations.Catblocks.Heading" }}', - description: '{{ T "FeedbackPage.PreSendWarning.Variations.Catblocks.Description" | htmlEscape }}', + folders: { + heading: '{{ T "FeedbackPage.PreSendWarning.Variations.Folders.Heading" }}', + description: '{{ T "FeedbackPage.PreSendWarning.Variations.Folders.Description" | htmlEscape }}', }, } }, diff --git a/static/assets/js/feedback.js b/static/assets/js/feedback.js index 3f1966454..09a1375a4 100644 --- a/static/assets/js/feedback.js +++ b/static/assets/js/feedback.js @@ -32,21 +32,13 @@ const variations = { /\bdelete\s*account\b/, ] }, - catblocks: { + folders: { strings: { - ...i18n.preSendWarning.variations.catblocks + ...i18n.preSendWarning.variations.folders }, patterns: [ - /\beditor\b/, - /\bproject\b/, - /\bprojects\b/, - /\bblock\b/, - /\bblocks\b/, - /\broken\b/, - /\bcat\b/, - /\bhelp\b/, - /\bproblem\b/, - /\bbug\b/, + /\bfolder\b/, + /\bfolders\b/, ] }, }