Commit 60bf05fb authored by seotts's avatar seotts

Reuse l10n strings instead of duplicating them

parent ccab9566
...@@ -239,7 +239,7 @@ class ComposeComment extends React.Component { ...@@ -239,7 +239,7 @@ class ComposeComment extends React.Component {
commentType: justMuted ? 'comment.type.unconstructive' : 'comment.type.unconstructive.past', commentType: justMuted ? 'comment.type.unconstructive' : 'comment.type.unconstructive.past',
muteStepHeader: 'comment.unconstructive.header', muteStepHeader: 'comment.unconstructive.header',
muteStepContent: [ muteStepContent: [
justMuted ? 'comment.unconstructive.content1' : 'comment.unconstructive.content1.past', justMuted ? 'comment.unconstructive.content1' : 'comment.type.unconstructive.past',
'comment.unconstructive.content2' 'comment.unconstructive.content2'
] ]
}, },
...@@ -248,7 +248,7 @@ class ComposeComment extends React.Component { ...@@ -248,7 +248,7 @@ class ComposeComment extends React.Component {
commentType: justMuted ? 'comment.type.vulgarity' : 'comment.type.vulgarity.past', commentType: justMuted ? 'comment.type.vulgarity' : 'comment.type.vulgarity.past',
muteStepHeader: 'comment.vulgarity.header', muteStepHeader: 'comment.vulgarity.header',
muteStepContent: [ muteStepContent: [
justMuted ? 'comment.vulgarity.content1' : 'comment.vulgarity.content1.past', justMuted ? 'comment.vulgarity.content1' : 'comment.type.vulgarity.past',
'comment.vulgarity.content2' 'comment.vulgarity.content2'
] ]
}, },
......
...@@ -60,13 +60,11 @@ ...@@ -60,13 +60,11 @@
"comment.type.unconstructive.past": "It appears that one of your recent comments was saying something that might have been hurtful.", "comment.type.unconstructive.past": "It appears that one of your recent comments 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.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.content1": "It appears that your comment was saying something that might have been hurtful.",
"comment.unconstructive.content1.past": "It appears that one of your recent comments 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.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": "Your most recent comment appeared to include a bad word.", "comment.type.vulgarity": "Your most recent comment appeared to include a bad word.",
"comment.type.vulgarity.past": "It appears that one of your recent comments contained a bad word.", "comment.type.vulgarity.past": "It appears that one of your recent comments contained a bad word.",
"comment.vulgarity.header": "We encourage you to use language that’s appropriate for all ages.", "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.content1": "It appears that your comment contains a bad word.",
"comment.vulgarity.content1.past": "It appears that one of your recent comments contained 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.", "comment.vulgarity.content2": "Scratch has users of all ages, so it’s important to use language that is appropriate for all Scratchers.",
"comment.type.spam": "Your most recent comment appeared to contain advertising, text art, or a chain message.", "comment.type.spam": "Your most recent comment appeared to contain advertising, text art, or a chain message.",
"comment.type.spam.past": "It appears that one of your recent comments contained advertising, text art, or a chain message.", "comment.type.spam.past": "It appears that one of your recent comments contained advertising, text art, or a chain message.",
......
...@@ -571,7 +571,7 @@ describe('Compose Comment test', () => { ...@@ -571,7 +571,7 @@ describe('Compose Comment test', () => {
commentInstance.setState({muteType: 'vulgarity'}); commentInstance.setState({muteType: 'vulgarity'});
expect(commentInstance.getMuteMessageInfo(false).commentType).toBe('comment.type.vulgarity.past'); expect(commentInstance.getMuteMessageInfo(false).commentType).toBe('comment.type.vulgarity.past');
expect(commentInstance.getMuteMessageInfo(false).muteStepContent[0]).toBe('comment.vulgarity.content1.past'); expect(commentInstance.getMuteMessageInfo(false).muteStepContent[0]).toBe('comment.type.vulgarity.past');
}); });
test('getMuteMessageInfo: muteType not set and just got muted', () => { test('getMuteMessageInfo: muteType not set and just got muted', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment