Merge branch 'staging' into drone-s3-cache

Author: Winter Dong

.drone.yml

@@ -24,16 +24,6 @@ steps:
         exit 1
       fi
 
-- name: restore-cache
-  image: plugins/s3-cache
-  settings:
-    pull: true
-    restore: true
-    access_key:
-      from_secret: S3_CACHE_ACCESS_KEY
-    secret_key:
-      from_secret: S3_CACHE_SECRET_KEY
-
 - name: unit-tests
   image: wintercdo/code-dot-org:0.7
   volumes:

apps/src/code-studio/header.js

@@ -3,7 +3,6 @@
 import $ from 'jquery';
 import _ from 'lodash';
 import progress from './progress';
-import Dialog from './LegacyDialog';
 import { getStore } from '../redux';
 import { shareProject } from './headerShare';
 import { convertBlocksXml } from '../craft/code-connection/utils';
@@ -406,26 +405,6 @@ header.showProjectHeader = function () {
     e.stopPropagation(); // Clicks inside the popup shouldn't close it.
   });
 
-  $('.project_delete').click(function (e) {
-    e.preventDefault(); // Don't change the hash.
-    var dialog = new Dialog({body: '<img class="modal-image" src="' + appOptions.skin.staticAvatar + '">' +
-        '<div id="confirm-delete" class="modal-content">' +
-        '<p class="dialog-title">' + dashboard.i18n.t('project.delete_confirm_title') + '</p>' +
-        '<p>' + dashboard.i18n.t('project.delete_confirm_text') + '</p>' +
-        '<button id="again-button">' + dashboard.i18n.t('project.cancel') + '</button>' +
-        '<button id="continue-button" style="float: right">' + dashboard.i18n.t('project.delete') + '</button></div>'
-    });
-    dialog.show();
-    $('#confirm-delete #continue-button').click(function () {
-      dashboard.project.delete(function () {
-        location.href = dashboard.project.appToProjectUrl();
-      });
-    });
-    $('#confirm-delete #again-button').click(function () {
-      dialog.hide();
-    });
-  });
-
   $('.project_new').click(dashboard.project.createNew);
 
   $(document).on('click', '.project_list', function () {

dashboard/config/locales/blocks.en.yml

@@ -873,6 +873,8 @@ en:
         text: move {SPRITE} distance {DISTANCE} toward {TARGET}
       gamelab_moveUp:
         text: "{THIS} move up"
+      gamelab_playSound:
+        text: playSound {SOUND}
       gamelab_pointInDirection:
         text: point {SPRITE} {DIRECTION}
         options:
@@ -1378,6 +1380,8 @@ en:
         text: turn left
       RyanLab_turnRight:
         text: turn right
+      SpriteLab2Beta_spriteSay:
+        text: sprite {SPRITE} say {TEXT} for {SECONDS} seconds
       Vector_createSpriteWith:
         text: |-
           create sprite
@@ -1405,12 +1409,16 @@ en:
             "'shapeColor'": color
       aalab_addBehaviorForDuration:
         text: aalab sprite {SPRITE} begins {BEHAVIOR} for {SECONDS} seconds
+      aalab_addBehaviorSimpleFlexible:
+        text: aalab sprite {SPRITE} begins {BEHAVIOR}
       aalab_addBehaviorUntilBoolean:
         text: aalab sprite {SPRITE} begins {BEHAVIOR} until {CONDITION}
       aalab_addToSpriteGroup:
         text: add sprite {SPRITE} to group {GROUP}
-      aalab_changeGroupPropBy:
-        text: change group {GROUP} {PROPERTY} by {VAL}
+      aalab_allSpritesWithCostume:
+        text: aalab {COSTUME}
+      aalab_changePropByFlexible:
+        text: aalab change {SPRITE} {PROPERTY} by {VAL}
         options:
           PROPERTY:
             '"scale"': size

dashboard/config/locales/callouts.en.yml

@@ -1434,8 +1434,8 @@ en:
         courseD_maze_ramp7_1: This is your first challenge puzzle! These are meant to be hard and may take several tries.
       courseD_scrat_ramp8_2018_callout:
         courseD_maze_ramp7_1: This is your first challenge puzzle! These are meant to be hard and may take several tries.
-      courseE_aboutme_4_callout:
-        courseE_aboutme_4_callout_1: Press here to draw a sprite!
+      courseE_aboutme_5_callout:
+        courseE_aboutme_4_callout_1: Click here!
       courseE_artist_concept_challenge2_callout: {}
       courseE_artist_concept_challenge2_2018_callout: {}
       courseE_artist_concept_challenge2_2019_callout: {}

dashboard/config/locales/long_instructions.en.yml

@@ -21255,6 +21255,7 @@ en:
       Fish Tank 4: Our fish tank needs some water! Use the `set background color` block to make the background blue.
       Fish Tank 5-validated: Our fish is getting a little lonely. Add another sprite to the fish tank.
       Fish Tank 5-validated_2019: Our fish is getting a little lonely. Add another sprite to the fish tank.
+      Fish Tank 5-validated_2019_implicitGroupTest: Our fish is getting a little lonely. Add another sprite to the fish tank.
       Fish Tank 5-validated_simple: The fish wants a friend.   Add a new sprite.
       Fish Tank 5: Our fish is getting a little lonely. Create a new sprite inside the fish tank.
       Fish Tank 6-validated: "What do you want your fish’s new friend to do?   \n\nAdd a behavior and watch them go!"
@@ -22907,7 +22908,6 @@ en:
         * Shrink the size of the instructions area to resize how tall the web page is
       Search Engine Optimizer: "# Search Engine Optimizer (SEO)\n\n**Search Engine Optimization** is the process of maximizing the number of visitors to a particular website by ensuring that the site appears high on the list of results returned by a search engine.  A **Search Engine Optimizer** is a tool that analyzes a website on different qualities that lead to a higher rank on different search engines.\n\n# Do This\n\n* Open the SEO tool linked below in another tab\n* Try each of the websites on your list on the SEO:\n\t* Look at the score each website receives\n    * Does your ranking generally correlate to the SEO scores?\n* Take a look at how the SEO is rating websites:\n    * Look through the different sections of the rating\n    ![](https://images.code.org/dc938c470e578683f788d641c22a2699-image-1476900428201.05.20 PM.png) \n    * What factors does the SEO use to score websites? \n    * Are there new factors you could use in your algorithm that you had not thought of before?"
       Software Accessibility: "# Software Accessibility: Validator\n\nHTML is designed to display the same way on all computers, but sometimes you’ll notice that different web browsers, or even different versions of the same browser, display a website differently. Often this is because you either missed a rule of HTML, or didn’t describe your content specifically enough. Fortunately there’s a tool called the Validator that can check your code for errors!\n\n# Do This\n\n* Open up the <a href=\"https://validator.w3.org/#validate_by_input\" target=\"_blank\">Validator - Website</a>\n* For each html file in your project\n\t* Copy the html into the box\n    * Click check to see if there are an error\n\t* Make a list of all unique errors.\n    * For each error, write in your own words what you think it means\n    * For each error, search to find a potential solution."
-      Standalone_Artist_1: "Welcome to Artist! First off, let's try to make a simple square using the turn right block and move forward block. Each side should be 100 pixels long.\n\n"
       Standalone_Artist_2: "Draw this diamond with 120 and 60 degree angles and 150 pixel long sides.\n\n"
       Standalone_Artist_3: "Can you draw this hexagon with 100 pixel sides and 60 degree turns?\n\n"
       Standalone_Artist_4: "Now you've got a new block to play with, the loop. This will repeat a set of commands. What happens if you loop these commands 6 times?\n\n"
@@ -32651,7 +32651,30 @@ en:
       courseD_scrat_ramp7_2018: Help Scrat get to the acorn!
       courseD_scrat_ramp8: "**Challenge:** Use what you've learned to get Scrat to the acorn!"
       courseD_scrat_ramp8_2018: "**Challenge:** Use what you've learned to get Scrat to the acorn!"
-      courseE_aboutme_2: Ritchie loves to talk, so let's make him share some **Personal Information** when he is clicked! Just be careful that he doesn't accidentally share any **Private Information** as well, such as his full name, his address, his phone number, his parent's credit card number, or anything else that can identify him on the web. Instead, perhaps he can share his hobbies, his favorite video games, or even the lyrics to a song he wrote? You decide!
+      courseE_aboutme_2: |-
+        Rikki has so many cool things to share! In addition to her greeting, let's make her share some **Personal Information** when she is clicked.
+
+        Feel free to use your imagination to help Rikki. Just be careful that she doesn't accidentally share any **Private Information** as well!
+
+        **SAFE - Personal Information**
+        * first name
+        * favorite video games, books, or TV shows
+        * respectful opinions (no insults or bad language)
+
+        **UNSAFE - Private Information**
+        * full name
+        * home address
+        * phone number
+      courseE_aboutme_freeplay: |-
+        **Freeplay:** The world is yours! Express yourself by creating an **interactive poster**. Use custom sprite costumes, messages, and events to tell the world about yourself!
+
+        **Remember! Only share SAFE information.** Do not share anything that someone could use to identify you (address, full name, date of birth, etc).
+
+        Try some of these ideas:
+        * Create sprites with costumes that represent your personality and tastes!
+        * Draw yourself, your pets, or your favorite foods!
+        * Assign behaviors to your sprites! Make a sprite move around when clicked!
+        * Make events trigger messages! Perhaps sprites "talk" when they touch each other?
       courseE_artist_concept1: "Recreate this image. \n\n- The hexagons have sides of 50 pixels\n- The hexagons are 100 pixels apart\n- The pen widths of the hexagons are 1 pixel, 4 pixels, and 8 pixels."
       courseE_artist_concept1_2018: "Recreate this image. \n\n- The hexagons have sides of 50 pixels\n- The hexagons are 100 pixels apart\n- The pen widths of the hexagons are 1 pixel, 4 pixels, and 8 pixels."
       courseE_artist_concept1_2019: "Recreate this image. \n\n- The hexagons have sides of 50 pixels\n- The hexagons are 100 pixels apart\n- The pen widths of the hexagons are 1 pixel, 4 pixels, and 8 pixels."
@@ -34434,6 +34457,7 @@ en:
 
         * What are facilitators doing?
         * What are teachers doing?
+      elijah - test toolboxes: Here's a block! <xml><block type="math_number"><title name="NUM">255</title></block></xml> Yay!
       engagement-monday: |+
         # Day 1: Engagement
 

dashboard/config/locales/short_instructions.en.yml

@@ -1711,6 +1711,7 @@ en:
       Fish Tank 4-validated_simple: Use the `set background color` block to make the background blue.
       Fish Tank 5-validated: Our fish is getting a little lonely. Add another sprite to the fish tank.
       Fish Tank 5-validated_2019: Our fish is getting a little lonely. Add another sprite to the fish tank.
+      Fish Tank 5-validated_2019_implicitGroupTest: Our fish is getting a little lonely. Add another sprite to the fish tank.
       Fish Tank 5-validated_simple: The fish wants a friend.   Add a new sprite.
       Fish Tank 6-validated: Add a behavior to the fish's new friend.
       Fish Tank 6-validated_2019: Add a behavior to the fish's new friend.
@@ -4920,10 +4921,17 @@ en:
       courseD_scrat_ramp7_2018: Help Scrat get to the acorn!
       courseD_scrat_ramp8: Use what you've learned to get Scrat to the acorn!
       courseD_scrat_ramp8_2018: Use what you've learned to get Scrat to the acorn!
-      courseE_aboutme_1: This is Ritchie! He likes to talk. Everything he says will appear in the **Text Box** below him. Click "▶ Run" to make him talk now!
-      courseE_aboutme_2: 'Ritchie loves to talk, so let''s make him share some **Personal Information** when he is clicked! Just be careful that he doesn''t accidentally share any **Private Information** as well!  '
-      courseE_aboutme_3: Here is Ritchie's best friend Kenny. Make Kenny also share some **Personal Information** when he is clicked! Just as with Ritchie, be careful that Kenny does not accidentally share any **Private Information**!
-      courseE_aboutme_4: Now it's time for you to create your own sprite! Click on the animation tab!
+      courseE_aboutme_1: "This is Rikki! Well, it's really just a drawing she made of herself. \n\nYou see, Rikki is using SpriteLab to create an **interactive poster** that she can share with everyone on the web, and this is what she's made so far!\n\nRead the code below, then locate the **Text Box** below Rikki. Run the code and click Rikki to see her message appear!"
+      courseE_aboutme_2: |-
+        Rikki has so many cool things to share! In addition to her greeting, let's make her share some **Personal Information** when she is clicked.
+
+        Feel free to use your imagination to help Rikki. Just be careful that she doesn't accidentally share any **Private Information** as well!
+      courseE_aboutme_4: "Here is Rikki's best friend Thuy! Well, a cool drawing of her anyway! \n\nMake Thuy also share some **Personal Information** when she is clicked. \n\nJust as with Rikki, be careful that Thuy does not accidentally share any **Private Information**!"
+      courseE_aboutme_5: Rikki thinks you might be able to draw a better costume for her sprite. Click the **Animation** tab, draw a costume, and replace Rikki's with your own in the code below!
+      courseE_aboutme_freeplay: |-
+        **Freeplay:** The world is yours! Express yourself by creating an **interactive poster**. Use custom sprite costumes, messages, and events to tell the world about yourself!
+
+        **Remember! Only share SAFE information.** Do not share anything that someone could use to identify you (address, full name, date of birth, etc).
       courseE_artist_concept1: 'Recreate this image. '
       courseE_artist_concept1_2018: 'Recreate this image. '
       courseE_artist_concept1_2019: 'Recreate this image. '

dashboard/test/ui/features/teacher_dashboard.feature

@@ -1,4 +1,3 @@
-@no_ie
 @no_mobile
 @dashboard_db_access
 @pegasus_db_access

dashboard/test/ui/features/teacher_dashboard_assessments1.feature

@@ -1,4 +1,3 @@
-@no_ie
 @no_mobile
 @dashboard_db_access
 @pegasus_db_access

dashboard/test/ui/features/teacher_dashboard_assessments2.feature

@@ -1,4 +1,3 @@
-@no_ie
 @no_mobile
 @dashboard_db_access
 @pegasus_db_access

i18n/locales/source/blockly-mooc/common.json

@@ -1031,7 +1031,7 @@
   "projectsViewAll": "View all projects",
   "projectsViewProjectGallery": "View projects",
   "projects": "Projects",
-  "projectsSubHeading": "Over 35 million projects created",
+  "projectsSubHeading": "Over {project_count} million projects created",
   "print": "Print",
   "privacyPolicy": "Privacy Policy",
   "projectWarning": "Note: You are on a level that is part of a longer project. Changes made on this level will also appear in other levels in the project.",
@@ -1280,6 +1280,7 @@
   "subtitle": "a visual programming environment",
   "success": "Success!",
   "summaryAssessmentsOverview": "Multiple choice questions overview",
+  "switchSection": "Switch section:",
   "syncClever": "Sync students from Clever",
   "syncGoogleClassroom": "Sync students from Google Classroom",
   "syntaxErrorMsg": "Your program contains a typo. Please remove line {lineNumber} and try again.",

i18n/locales/source/dashboard/blocks.yml

@@ -873,6 +873,8 @@ en:
         text: move [SPRITE][0] distance [DISTANCE][1] toward [TARGET][2]
       gamelab_moveUp:
         text: "[THIS][0] move up"
+      gamelab_playSound:
+        text: playSound [SOUND][0]
       gamelab_pointInDirection:
         text: point [SPRITE][0] [DIRECTION][1]
         options:
@@ -1374,6 +1376,8 @@ en:
         text: turn left
       RyanLab_turnRight:
         text: turn right
+      SpriteLab2Beta_spriteSay:
+        text: sprite [SPRITE][0] say [TEXT][1] for [SECONDS][2] seconds
       Vector_createSpriteWith:
         text: |-
           create sprite
@@ -1401,12 +1405,16 @@ en:
             "'shapeColor'": color
       aalab_addBehaviorForDuration:
         text: aalab sprite [SPRITE][0] begins [BEHAVIOR][1] for [SECONDS][2] seconds
+      aalab_addBehaviorSimpleFlexible:
+        text: aalab sprite [SPRITE][0] begins [BEHAVIOR][1]
       aalab_addBehaviorUntilBoolean:
         text: aalab sprite [SPRITE][0] begins [BEHAVIOR][1] until [CONDITION][2]
       aalab_addToSpriteGroup:
         text: add sprite [SPRITE][0] to group [GROUP][1]
-      aalab_changeGroupPropBy:
-        text: change group [GROUP][0] [PROPERTY][1] by [VAL][2]
+      aalab_allSpritesWithCostume:
+        text: aalab [COSTUME][0]
+      aalab_changePropByFlexible:
+        text: aalab change [SPRITE][0] [PROPERTY][1] by [VAL][2]
         options:
           PROPERTY:
             '"scale"': size

i18n/locales/source/dashboard/callouts.yml

@@ -1434,8 +1434,8 @@ en:
         courseD_maze_ramp7_1: This is your first challenge puzzle! These are meant to be hard and may take several tries.
       courseD_scrat_ramp8_2018_callout:
         courseD_maze_ramp7_1: This is your first challenge puzzle! These are meant to be hard and may take several tries.
-      courseE_aboutme_4_callout:
-        courseE_aboutme_4_callout_1: Press here to draw a sprite!
+      courseE_aboutme_5_callout:
+        courseE_aboutme_4_callout_1: Click here!
       courseE_artist_concept_challenge2_callout: {}
       courseE_artist_concept_challenge2_2018_callout: {}
       courseE_artist_concept_challenge2_2019_callout: {}

i18n/locales/source/dashboard/dsls.yml

@@ -1990,8 +1990,11 @@ en:
         description here: description here
         title: title
       OPD-K5 Stage4Go: {}
+      OPD-K5 Stage4Go2: {}
+      OPD-K5 Stage4Review: {}
       OPD-K5 Stage4Start: {}
       OPD-K5 Stage5Go: {}
+      OPD-K5 Stage5Review: {}
       OPD-K5 Stage5Start: {}
       OPD-K5 Stage6Go: {}
       OPD-K5 Stage6Start: {}
@@ -4212,6 +4215,7 @@ en:
         Scratch Jr: Scratch Jr
     level_group:
       name:
+        CSD U1 End of Unit Test: {}
         CSD Unit 1 Post Project Assessment 2018: {}
         CSP Culminating Assessment: {}
         CSP Cumulative Assess A: {}
@@ -11790,6 +11794,16 @@ en:
         Scrat will move forward three times, turn, then move forward three more times, making it to the acorn!: Scrat will move forward three times, turn, then move forward three more times, making it to the acorn!
         Scrat will move forward, then turn and crash.: Scrat will move forward, then turn and crash.
         This code uses a new block. What do you think will happen when you press "Run"?: This code uses a new block. What do you think will happen when you press "Run"?
+      courseE_aboutme_3_multi:
+        Great idea! Rikki can't be identified through cartoon drawings.: Great idea! Rikki can't be identified through cartoon drawings.
+        'Help! Rikki doesn''t know what other information is safe for her to share. Which ONE of the following would you recommend? ': 'Help! Rikki doesn''t know what other information is safe for her to share. Which ONE of the following would you recommend? '
+        No! Rikki's email address should only be shared directly with people or websites she can trust.: No! Rikki's email address should only be shared directly with people or websites she can trust.
+        No! Someone could steal Rikki's identity with her student ID number!: No! Someone could steal Rikki's identity with her student ID number!
+        No! Someone could steal the photograph and say its a picture of THEIR family. Yikes!: No! Someone could steal the photograph and say its a picture of THEIR family. Yikes!
+        Rikki could share a photograph of her family.: Rikki could share a photograph of her family.
+        Rikki could share cartoon drawings of herself.: Rikki could share cartoon drawings of herself.
+        Rikki could share her email address: Rikki could share her email address
+        Rikki could share her student ID number.: Rikki could share her student ID number.
       courseE_multi_artist_predict1:
         Based on the code below, what do you think will happen if you press 'Run'?: Based on the code below, what do you think will happen if you press 'Run'?
         Correct!: Correct!