Merge pull request #19716 from code-dot-org/staging

DTT (Staging > Test) [robo-dtt]

apps/tasks/messages.js

@@ -10,8 +10,11 @@ module.exports = function (grunt) {
       filePair.src.forEach(function (src) {
         var locale = path.basename(src, '.json');
         var namespace = path.basename(filePair.dest).split('.js')[0];
+        var englishData = grunt.file.readJSON(src.replace(locale, 'en_us'));
+        var localeData = grunt.file.readJSON(src);
+        var finalData = Object.assign(englishData, localeData);
         try {
-          var formatted = process(locale, namespace, grunt.file.readJSON(src));
+          var formatted = process(locale, namespace, finalData);
           grunt.file.write(filePair.dest, formatted);
         } catch (e) {
           var errorMsg = "Error processing localization file " + src + ": " + e;

dashboard/config/locales/dsls.en.yml

@@ -409,6 +409,7 @@ en:
         Students usually work independently: Students usually work independently
       U5 evaluation q1:
         Are you new to even-drive programming?: Are you new to even-drive programming?
+        Are you new to event-driven programming?: Are you new to event-driven programming?
         'No': 'No'
         'Yes': 'Yes'
       U5 evaluation q2:

dashboard/config/locales/scripts.en.yml

@@ -4932,6 +4932,8 @@ en:
               name: Structuring Data
               description_student: This lesson goes further into the interpretation of data, including cleaning and visualizing raw data sets.  The class first looks at the how presenting data in different ways can help people to understand it better.  After seeing how cleaning and visualization can help people make better decisions, the class looks at what parts of this process can be automated, and what need a human.
               description_teacher: In this lesson, students go further into the collection and interpretation of data, including cleaning and visualizing raw data sets.  Students first look at the how presenting data in different ways can help people to understand it better.  They then visualize their own raw data set, in the context of a pizza topping survey, deciding what to do with data that does not easily fit into the visualization scheme that they have chosen.  Last, students look at what parts of this process can be automated, and what need a human to make decisions.
+            Keeping Data Secret:
+              name: Keeping Data Secret
         csd3-old:
           title: CSD Unit 3 (DEPRECATED)
           description_audience: ''

dashboard/config/scripts/csd5.script

@@ -33,7 +33,7 @@ level 'CSD U5 binary 6-new', progression: 'Binary Numbers'
 level 'CSD U5 binary 7-new', progression: 'Binary Numbers'
 named_level 'CSD U5 binary video'
 
-stage 'Encryption', flex_category: 'csd5_1'
+stage 'Keeping Data Secret', flex_category: 'csd5_1'
 named_level 'CSD-U5-SFLP Representing Numbers Part 2'
 level 'CSD U5 Encryption 1', progression: 'Keeping Data Secret'
 

dashboard/config/scripts/csd6-draft.script

@@ -139,13 +139,15 @@ level 'CSDU6 circuit playground piano', progression: 'Making Sounds'
 level 'CSDU6 frequency modification', progression: 'Making Sounds'
 level 'CSDU6 frequency creation', progression: 'Making Sounds'
 named_level 'Making Music'
-level 'CSDU6 piano with notes', progression: 'Playing with Sounds'
+level 'CSDU6 piano with notes', progression: 'Playing with Notes'
 named_level 'CSD-Arrays'
 level 'CSD U6 array piano', progression: 'Musical Arrays'
 level 'CSD U6 random array notes', progression: 'Musical Arrays'
 level 'CSDU6 making new arrays', progression: 'Musical Arrays'
 level 'CSDU6 play predict code', progression: 'Making Songs'
 level 'CSDU6 play songs', progression: 'Making Songs'
+level 'CSDU6 play null notes', progression: 'Making Songs'
+level 'CDU U6 Playground Sound Board', progression: 'Making Songs'
 bonus 'CSDU6 challenge play songs'
 bonus 'CSDU6 buzzer 2d arrays'
 bonus 'CSDU6 buzzer.stop'

dashboard/config/scripts/csd_u5_sflp_automating_data_decisions.external

@@ -7,7 +7,8 @@ You'll see an example of how a computer could be used to complete essentially ev
 
 ## Resources
 
-* [Automating Data Decisions](https://docs.google.com/document/d/171qhxBWGgePPCebKUOUq3VbAQVoQ8rBmTHxx1i5ZZ7U/export?format=pdf) - Activity Guide
+* [Automating Data Decisions](https://docs.google.com/document/d/1BaqqDWT1Y0cA80ytaXOfB8RbnVpMsqQ4K7KU_kX__gs/export?format=pdf) - Resource (copy as [MS Word](https://docs.google.com/document/d/1BaqqDWT1Y0cA80ytaXOfB8RbnVpMsqQ4K7KU_kX__gs/export?format=doc), [Google Doc](https://docs.google.com/document/d/1BaqqDWT1Y0cA80ytaXOfB8RbnVpMsqQ4K7KU_kX__gs/copy))
+* [Automating Data Decisions](https://docs.google.com/document/d/1ww7OiPAWu03K2C3c5LKbUm_Opkz9x0lZfizA_uJ7JsI/export?format=pdf) - Activity Guide (copy as [MS Word](https://docs.google.com/document/d/1ww7OiPAWu03K2C3c5LKbUm_Opkz9x0lZfizA_uJ7JsI/export?format=doc), [Google Doc](https://docs.google.com/document/d/1ww7OiPAWu03K2C3c5LKbUm_Opkz9x0lZfizA_uJ7JsI/copy))
 MARKDOWN
 
 teacher_markdown <<MARKDOWN

dashboard/config/scripts/levels/CDU U6 Playground Sound Board.level

@@ -7,14 +7,28 @@
   "properties": {
     "skin": "applab",
     "code_functions": {
-      "buzzer.play": null,
       "onBoardEvent": null,
       "buzzer.note": null,
-      "buzzer.frequency": null
+      "buzzer.frequency": null,
+      "buzzer.playNotes": null,
+      "accessListItem": null,
+      "led.on": null,
+      "led.off": null,
+      "color": null,
+      "on": null,
+      "intensity": null,
+      "stop": null,
+      "toggle": null,
+      "led.blink": null,
+      "blink": null,
+      "led.toggle": null,
+      "led.pulse": null,
+      "off": null,
+      "randomNumber_min_max": null
     },
     "edit_code": true,
     "embed": "false",
-    "markdown_instructions": "# Sound Board 2.0\r\n\r\nYou're gonna turn your board into a sound board, one that can play actual songs!\r\n\r\n# Do This\r\n\r\n* Use all of the button related board events (up, down), to play a unique song at each event.\r\n* Are there any other events you could use to play even more songs?",
+    "markdown_instructions": "# Sound Board 2.0\r\n\r\nYou can now play sounds, notes, and songs! With this new knowledge, you can even turn your board into a sound board.\r\n\r\nIn the toolbox you all of the buzzer and led related blocks at your disposal. See what cool stuff you can come up with!\r\n\r\n# Do This\r\n\r\n* Use all of the button related board events (up, down), to play a unique sound or song at each event.\r\n* Are there any other events you could use to play even more sounds/songs?",
     "instructions_important": "false",
     "is_k1": "false",
     "skip_instructions_popup": "false",
@@ -51,11 +65,14 @@
     "fail_on_lint_errors": "false",
     "debugger_disabled": "false",
     "makerlab_enabled": "true",
-    "contained_level_names": null
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2017-12-16 00:04:48 +0000\",\"changed\":[\"notes\",\"code_functions\",\"contained_level_names\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"},{\"changed_at\":\"2017-12-16 00:05:56 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\",\"markdown_instructions\",\"hide_view_data_button\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"}]",
+  "audit_log": "[{\"changed_at\":\"2017-12-16 00:04:48 +0000\",\"changed\":[\"notes\",\"code_functions\",\"contained_level_names\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"},{\"changed_at\":\"2017-12-16 00:05:56 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\",\"markdown_instructions\",\"hide_view_data_button\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"},{\"changed_at\":\"2018-01-02 18:54:20 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"},{\"changed_at\":\"2018-01-02 19:10:53 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"encrypted_examples\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"},{\"changed_at\":\"2018-01-02 19:43:09 +0000\",\"changed\":[\"code_functions\",\"markdown_instructions\",\"contained_level_names\"],\"changed_by_id\":568,\"changed_by_email\":\"meilani.eyre@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>

dashboard/config/scripts/levels/CSD U3 Movement Your Own.level

@@ -70,13 +70,20 @@
       "addOperator": null,
       "subtractOperator": null,
       "multiplyOperator": null,
-      "divideOperator": null
+      "divideOperator": null,
+      "World.frameRate": null
     },
     "start_blocks": "// Create sprites and set animation images\r\n\r\nfunction draw(){\r\n  // Draw a background\r\n  \r\n  // Update properties using the counter pattern\r\n  \r\n  // Draw sprites\r\n  \r\n}",
-    "contained_level_names": null
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ],
+    "disable_procedure_autopopulate": "false",
+    "top_level_procedure_autopopulate": "false"
   },
   "published": true,
   "notes": "",
+  "audit_log": "[{\"changed_at\":\"2018-01-02 17:50:10 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\"],\"changed_by_id\":1,\"changed_by_email\":\"josh@code.org\"}]",
   "level_concept_difficulty": {
   }
 }]]></config>