Merge pull request #4900 from chrisgarrity/auto-mod/update-copy

Auto mod/update copy

src/components/commenting-status/commenting-status.scss

@@ -12,9 +12,11 @@
     p {
         margin-bottom: 0;
         line-height: 1.75rem;
+        max-width: 36rem;
     }
     .bottom-text {
         font-size: .875rem;
+        width: 100%;
     }
     .status-icon-class {
         width: 28px;

src/views/preview/comment/compose-comment.jsx

@@ -207,9 +207,9 @@ class ComposeComment extends React.Component {
                 muteStepContent: ['comment.vulgarity.content1', 'comment.vulgarity.content2']
             },
             general: {
-                commentType: 'comment.type.disrespectful',
-                muteStepHeader: 'comment.disrespectful.header',
-                muteStepContent: ['comment.disrespectful.content1', 'comment.disrespectful.content2']
+                commentType: 'comment.type.general',
+                muteStepHeader: 'comment.general.header',
+                muteStepContent: ['comment.general.content1']
             }
         };
 

src/views/preview/l10n.json

@@ -46,21 +46,20 @@
     "project.cloudDataLink": "See Data",
     "project.usernameBlockAlert": "This project can detect who is using it, through the \"username\" block. To hide your identity, sign out before using the project.",
     "project.inappropriateUpdate": "Hmm...the bad word detector thinks there is a problem with your text. Please change it and remember to be respectful.",
-    "comment.type.disrespectful": "Scratch thinks your most recent comment was disrespectful.",
-    "comment.disrespectful.header": "Make sure to be friendly and respectful when using Scratch.",
-    "comment.disrespectful.content1": "The Scratch comment filter thinks your comment was disrespectful.",
-    "comment.disrespectful.content2": "Remember: There is a person behind every Scratch account and unfriendly comments can really hurt someone's feelings.",
-    "comment.type.pii": "The Scratch comment filter thought your most recent comment was sharing or asking for private information.",
-    "comment.pii.header": "Make sure not to share private information on Scratch.",
-    "comment.pii.content1": "The Scratch comment filter thinks that in your comment, you were sharing or asking for private information.",
+    "comment.type.general": "It appears that your most recent comment didn't follow the Scratch Community Guidelines.",
+    "comment.general.header": "We encourage you to post comments that follow the Scratch Community Guidelines.",
+    "comment.general.content1": "On Scratch, it's important for comments to be kind, to be appropriate for all ages, and to not contain spam.",
+    "comment.type.pii": "Your most recent comment appeared to be sharing or asking for private information.",
+    "comment.pii.header": "Please be sure not to share private information on Scratch.",
+    "comment.pii.content1": "It appears that you were sharing or asking for private information.",
     "comment.pii.content2": "Things you share on Scratch can be seen by everyone, and can appear in search engines. Private information can be used by other people in harmful ways, so it’s important to keep it private.",
     "comment.pii.content3": "This is a serious safety issue.",
-    "comment.type.unconstructive": "The Scratch comment filter thought your most recent comment was saying something bad about someone’s project.",
-    "comment.unconstructive.header": "Make sure to be supportive when commenting on other people’s projects",
-    "comment.unconstructive.content1": "The Scratch comment filter thinks your comment was saying something bad or mean about someone’s project.",
+    "comment.type.unconstructive": "It appears that your most recent comment was saying something that might have been hurtful.",
+    "comment.unconstructive.header": "We encourage you to be supportive when commenting on other people’s projects",
+    "comment.unconstructive.content1": "It appears that your comment was saying something that might have been hurtful.",
     "comment.unconstructive.content2": "If you think something could be better, you can say something you like about the project, and make a suggestion about how to improve it.",
-    "comment.type.vulgarity": "The Scratch comment filter thought your most recent comment contained a bad word.",
-    "comment.vulgarity.header": "Make sure to use language that’s appropriate for all ages",
-    "comment.vulgarity.content1": "The Scratch comment filter thinks your comment contains a bad word.",
+    "comment.type.vulgarity": "Your most recent comment appeared to include a bad word.",
+    "comment.vulgarity.header": "We encourage you to use language that’s appropriate for all ages.",
+    "comment.vulgarity.content1": "It appears that your comment contains a bad word.",
     "comment.vulgarity.content2": "Scratch has users of all ages, so it’s important to use language that is appropriate for all Scratchers."
 }

test/unit/components/compose-comment.test.jsx

@@ -347,12 +347,12 @@ describe('Compose Comment test', () => {
 
     test('getMuteMessageInfo: muteType not set', () => {
         const commentInstance = getComposeCommentWrapper({}).instance();
-        expect(commentInstance.getMuteMessageInfo().commentType).toBe('comment.type.disrespectful');
+        expect(commentInstance.getMuteMessageInfo().commentType).toBe('comment.type.general');
     });
 
     test('getMuteMessageInfo: muteType set to something we don\'t have messages for', () => {
         const commentInstance = getComposeCommentWrapper({}).instance();
         commentInstance.setState({muteType: 'spaghetti'});
-        expect(commentInstance.getMuteMessageInfo().commentType).toBe('comment.type.disrespectful');
+        expect(commentInstance.getMuteMessageInfo().commentType).toBe('comment.type.general');
     });
 });

test/unit/components/mute-modal.test.jsx

@@ -7,9 +7,9 @@ import Modal from '../../../src/components/modal/base/modal';
 
 describe('MuteModalTest', () => {
     const defaultMessages = {
-        commentType: 'comment.type.disrespectful',
-        muteStepHeader: 'comment.disrespectful.header',
-        muteStepContent: ['comment.disrespectful.content1', 'comment.disrespectful.content2']
+        commentType: 'comment.type.general',
+        muteStepHeader: 'comment.general.header',
+        muteStepContent: ['comment.general.content1']
     };
 
     test('Mute Modal rendering', () => {