Merge pull request #3558 from LLK/develop

Update release branch to include develop

package.json

@@ -126,7 +126,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20191114160340",
+    "scratch-gui": "0.1.0-prerelease.20191120175131",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

src/components/join-flow/username-step.jsx

@@ -39,7 +39,7 @@ class UsernameStep extends React.Component {
     componentDidMount () {
         // Send info to analytics when we aren't on the standalone page.
         // If we are on the standalone join page, the page load will take care of this.
-        if (!window.location.pathname.includes('/join')) {
+        if (window.location.pathname.indexOf('/join') === -1) {
             if (this.props.sendAnalytics) {
                 this.props.sendAnalytics('join-username-modal');
             }

src/l10n.json

@@ -230,6 +230,7 @@
     "registration.validationUsernameNotAllowed": "Username not allowed",
     "registration.validationUsernameVulgar": "Hmm, that looks inappropriate",
     "registration.validationUsernameInvalid": "Invalid username",
+    "registration.validationUsernameSpaces": "Usernames can't have spaces",
     "registration.validationEmailInvalid": "Email doesn’t look right. Try another?",
     "registration.waitForApproval": "Wait for Approval",
     "registration.waitForApprovalDescription": "You can log into your Scratch Account now, but the features specific to Teachers are not yet available. Your information is being reviewed. Please be patient, the approval process can take up to one day. You will receive an email indicating your account has been upgraded once your account has been approved.",

src/lib/validate.js

@@ -9,6 +9,8 @@ module.exports.validateUsernameLocally = username => {
         return {valid: false, errMsgId: 'registration.validationUsernameMinLength'};
     } else if (username.length > 20) {
         return {valid: false, errMsgId: 'registration.validationUsernameMaxLength'};
+    } else if (/\s/i.test(username)) {
+        return {valid: false, errMsgId: 'registration.validationUsernameSpaces'};
     } else if (!/^[\w-]+$/i.test(username)) {
         return {valid: false, errMsgId: 'registration.validationUsernameRegexp'};
     }

src/views/ideas/l10n-static.json

@@ -6,10 +6,16 @@
     "cards.story-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/story-cards.pdf",
     "cards.chase-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/chase-cards.pdf",
     "cards.video-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/video-cards.pdf",
+    "cards.pong-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/pong-cards.pdf",
+    "cards.fly-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/fly-cards.pdf",
+    "cards.imagine-cardsLink": "https://resources.scratch.mit.edu/www/cards/en/imagine-cards.pdf",
     "guides.NameGuideLink": "https://resources.scratch.mit.edu/www/guides/en/NameGuide.pdf",
     "guides.AnimateGuideLink": "https://resources.scratch.mit.edu/www/guides/en/AnimateGuide.pdf",
     "guides.MusicGuideLink": "https://resources.scratch.mit.edu/www/guides/en/MusicGuide.pdf",
     "guides.StoryGuideLink": "https://resources.scratch.mit.edu/www/guides/en/StoryGuide.pdf",
     "guides.ChaseGuideLink": "https://resources.scratch.mit.edu/www/guides/en/ChaseGuide.pdf",
-    "guides.VideoGuideLink": "https://resources.scratch.mit.edu/www/guides/en/VideoGuide.pdf"
+    "guides.VideoGuideLink": "https://resources.scratch.mit.edu/www/guides/en/VideoGuide.pdf",
+    "guides.PongGuideLink": "https://resources.scratch.mit.edu/www/guides/en/PongGuide.pdf",
+    "guides.FlyGuideLink": "https://resources.scratch.mit.edu/www/guides/en/FlyGuide.pdf",
+    "guides.ImagineGuideLink": "https://resources.scratch.mit.edu/www/guides/en/ImagineGuide.pdf"
 }

src/views/ideas/l10n.json

@@ -34,7 +34,7 @@
 
     "ideas.cardsPurchase": "Purchase Printed Set",
     "ideas.MakeItFlyTitle": "Make It Fly",
-    "ideas.MakeItFlyDescription": "Animate the Scratch Cat, The Powerpuff Girls, or even a taco!",
+    "ideas.MakeItFlyDescription": "Choose any character and make it fly!",
     "ideas.RaceTitle": "Race to the Finish",
     "ideas.RaceDescription": "Make a game where two characters race each other.",
     "ideas.HideAndSeekTitle": "Hide and Seek",
@@ -43,6 +43,8 @@
     "ideas.FashionDescription": "Make a game where you dress a character with different clothes and styles.",
     "ideas.PongTitle": "Pong Game",
     "ideas.PongDescription": "Make a bouncing ball game with sounds, points, and other effects.",
+    "ideas.ImagineTitle": "Imagine a World",
+    "ideas.ImagineDescription": "Imagine a world where anything is possible.",
     "ideas.DanceTitle": "Let's Dance",
     "ideas.DanceDescription": "Design an animated dance scene with music and dance moves.",
     "ideas.CatchTitle": "Catch Game",

src/views/ideas/ttt.json

@@ -9,13 +9,22 @@
         "guideUrl": "guides.NameGuideLink"
     },
     {
-        "title": "ideas.animateACharacterTitle",
-        "description": "ideas.animateACharacterDescription",
-        "thumbImage": "/images/ideas/activities/animate-a-character-thumb.jpg",
-        "modalImage": "/images/ideas/activities/animate-a-character-modal.jpg",
-        "tutorialUrl": "animate-a-character",
-        "cardsUrl": "cards.animation-cardsLink",
-        "guideUrl": "guides.AnimateGuideLink"
+        "title": "ideas.ImagineTitle",
+        "description": "ideas.ImagineDescription",
+        "thumbImage": "/images/ideas/activities/imagine-thumb.jpg",
+        "modalImage": "/images/ideas/activities/imagine-modal.jpg",
+        "tutorialUrl": "imagine",
+        "cardsUrl": "cards.imagine-cardsLink",
+        "guideUrl": "guides.ImagineGuideLink"
+    },
+    {
+        "title": "ideas.chaseGameTitle",
+        "description": "ideas.chaseGameDescription",
+        "thumbImage": "/images/ideas/activities/chase-game-thumb.jpg",
+        "modalImage": "/images/ideas/activities/chase-game-modal.jpg",
+        "tutorialUrl": "chase-game",
+        "cardsUrl": "cards.chase-cardsLink",
+        "guideUrl": "guides.ChaseGuideLink"
     },
     {
         "title": "ideas.makeMusicTitle",
@@ -36,13 +45,31 @@
         "guideUrl": "guides.StoryGuideLink"
     },
     {
-        "title": "ideas.chaseGameTitle",
-        "description": "ideas.chaseGameDescription",
-        "thumbImage": "/images/ideas/activities/chase-game-thumb.jpg",
-        "modalImage": "/images/ideas/activities/chase-game-modal.jpg",
-        "tutorialUrl": "chase-game",
-        "cardsUrl": "cards.chase-cardsLink",
-        "guideUrl": "guides.ChaseGuideLink"
+        "title": "ideas.MakeItFlyTitle",
+        "description": "ideas.MakeItFlyDescription",
+        "thumbImage": "/images/ideas/activities/fly-thumb.jpg",
+        "modalImage": "/images/ideas/activities/fly-modal.jpg",
+        "tutorialUrl": "make-it-fly",
+        "cardsUrl": "cards.fly-cardsLink",
+        "guideUrl": "guides.FlyGuideLink"
+    },
+    {
+        "title": "ideas.PongTitle",
+        "description": "ideas.PongDescription",
+        "thumbImage": "/images/ideas/activities/pong-thumb.jpg",
+        "modalImage": "/images/ideas/activities/pong-modal.jpg",
+        "tutorialUrl": "pong",
+        "cardsUrl": "cards.pong-cardsLink",
+        "guideUrl": "guides.PongGuideLink"
+    },
+    {
+        "title": "ideas.animateACharacterTitle",
+        "description": "ideas.animateACharacterDescription",
+        "thumbImage": "/images/ideas/activities/animate-a-character-thumb.jpg",
+        "modalImage": "/images/ideas/activities/animate-a-character-modal.jpg",
+        "tutorialUrl": "animate-a-character",
+        "cardsUrl": "cards.animation-cardsLink",
+        "guideUrl": "guides.AnimateGuideLink"
     },
     {
         "title": "ideas.videoSensingTitle",

test/unit/lib/validate.test.js

@@ -33,7 +33,7 @@ describe('unit test lib/validate.js', () => {
 
     test('validate username spaces not allowed', () => {
         const response = validate.validateUsernameLocally('abc def');
-        expect(response).toEqual({valid: false, errMsgId: 'registration.validationUsernameRegexp'});
+        expect(response).toEqual({valid: false, errMsgId: 'registration.validationUsernameSpaces'});
     });
 
     test('validate username special chars not allowed', () => {