Merge pull request #20949 from code-dot-org/droid-actor-numbers-fix

Remove droid actor numbers on conditionals
code-dot-org · Mar 1, 2018 · d64830c · d64830c
2 parents 37c6f97 + 3d82c78
commit d64830c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/apps/i18n/studio/en_us.json b/apps/i18n/studio/en_us.json
@@ -219,6 +219,7 @@
   "iceAge": "Ice Age!",
   "ifDroid": "droid",
   "ifDroidN": "droid {spriteIndex}",
+  "ifSprite": "actor",
   "ifSpriteN": "actor {spriteIndex}",
   "incrementPlayerScore" : "score point",
   "isSet": "is set",

diff --git a/apps/src/studio/blocks.js b/apps/src/studio/blocks.js
@@ -203,7 +203,8 @@ exports.install = function (blockly, blockInstallOptions) {
             .appendTitle(spriteNumberTextDropdown(msg.ifSpriteN), 'SPRITE');
         }
       } else {
-        block.appendDummyInput();
+        block.appendDummyInput()
+          .appendTitle(msg.ifSprite());
       }
     } else {
       block

diff --git a/dashboard/config/scripts/levels/New Star Wars Expanded Blocks Project.level b/dashboard/config/scripts/levels/New Star Wars Expanded Blocks Project.level
@@ -198,18 +198,18 @@
           <block type="logic_boolean">
             <title name="BOOL">TRUE</title>
           </block>
-          <block type="studio_ifActorPositionParams" inline="true">
+          <block type="studio_ifActorPosition" inline="true">
             <title name="POSITION">x</title>
             <title name="OPERATOR">EQ</title>
           </block>
-          <block type="studio_ifActorIsVisibleParams" inline="true">
+          <block type="studio_ifActorIsVisible" inline="true">
             <title name="VISIBILITY">false</title>
           </block>
-          <block type="studio_ifActorPositionElseParams" inline="true">
+          <block type="studio_ifActorPositionElse" inline="true">
             <title name="POSITION">x</title>
             <title name="OPERATOR">EQ</title>
           </block>
-          <block type="studio_ifActorIsVisibleElseParams" inline="true">
+          <block type="studio_ifActorIsVisibleElse" inline="true">
             <title name="VISIBILITY">false</title>
           </block>
         </category>