Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions i18n/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions layouts/shortcodes/specifics/feedback-form.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}',
},
}
},
Expand Down
16 changes: 4 additions & 12 deletions static/assets/js/feedback.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/,
]
},
}
Expand Down