Merge pull request code-dot-org#5437 from code-dot-org/fixslides

tanyaparker · tanyaparker · commit b25e15992f69 · 2015-11-16T17:32:06.000-08:00
fix show notes to use javascript style syntax when talking about blocks
diff --git a/dashboard/config/locales/slides.en.yml b/dashboard/config/locales/slides.en.yml
@@ -1352,17 +1352,17 @@ en:
         text: "To start off, we're going to work with Rey to program BB-8 to walk to collect all of the scrap parts. Your screen is split into three parts. On the left is the Star Wars game space, where code will run. The instructions for each level are written below the game space.This middle area is the toolbox and each of these blocks is a command that BB-8 can understand. The white space on the right is called the workspace and this is where we are going to build our program."
       5:
         image: 'notes/starwars_intro_5.png'
-        text: "If I drag the move left block to our workspace and press run, what happens? BB-8 moves left one block on the grid. And what if I want BB-8 to do something after the move left block? I can add another block to our program. I'm going to choose the move up block and I'll drag it under my move left block until the highlight appears. Then I'll drop it and the two blocks will snap together."
+        text: "If I drag the moveLeft(); block to our workspace and press run, what happens? BB-8 moves left one block on the grid. And what if I want BB-8 to do something after the moveLeft(); block? I can add another block to our program. I'm going to choose the moveUp(); block and I'll drag it under my moveLeft(); block until the highlight appears. Then I'll drop it and the two blocks will snap together."
       6:
         image: 'notes/starwars_intro_6.png'
-        text: "When I press run again, BB-8 will perform the commands that are stacked from top to bottom on our workspace. If you ever want to delete a block, just remove it from the stack and drag it back into the tool box. After you've hit run, you can always hit the reset button to get BB-8 back to the start. Now let's get rolling!"
+        text: "When I press run again, BB-8 will perform the commands that are stacked from top to bottom on our workspace. If you ever want to delete a block, just remove it from the stack and drag it back into the tool box. After you've hit Run, you can always hit the Reset button to get BB-8 back to the start. Now let's get rolling!"
     starwars_typing:
       1:
         image: 'notes/starwars_typing_1.png'
         text: "Inside the blocks we've been using are JavaScript commands. JavaScript is the most popular programming language for professional developers today. Blocks are a great way to get started learning to code and in fact, top universities like Harvard and Berkeley start teaching this way. But once we learn the basics, engineers write code by typing because it allows us to go faster."
       2:
         image: 'notes/starwars_typing_2.png'
-        text: "We can type hundreds of commands without having to find them in the toolbox or drag them out. Because you're learning typing may be slower at first but we wanted you to give it a try. In the upper right corner on your workspace, you can click the show text button on any puzzle to switch from blocks to typing code as text."
+        text: "We can type hundreds of commands without having to find them in the toolbox or drag them out. Because you're learning typing may be slower at first but we wanted you to give it a try. In the upper right corner on your workspace, you can click the Show Text button on any puzzle to switch from blocks to typing code as text."
       3:
         image: 'notes/starwars_typing_3.png'
         text: "In the next lesson, we'll start you out in typing mode. Here you can still drag the block from the toolbox or you can type the command name. As you start to type, you'll see names of possible commands show below where you're typing. Instead of typing the whole command name, you can select one of these to move faster. In my job, I use this auto-complete feature all the time when writing code."
@@ -1371,7 +1371,7 @@ en:
         text: "When you're typing code, the computer needs you to be very precise. You need to spell and capitalize the command name exactly correctly, including the parentheses and the semi-colon. Even with a small typing mistake, BB-8 cannot understand the code and won't be able to move. When you make an error on the line, the editor highlights it for you so that you can try changing your text to fix it."
       5:
         image: 'notes/starwars_typing_5.png'
-        text: "If you get stuck, you can always start over with the start over button and you can switch back to block mode at any time by clicking in the top-right corner. Ok, let's give typing a try! And if you make mistakes, don't get frustrated. It takes everybody a few tries to get it right."
+        text: "If you get stuck, you can always start over with the Start Over button and you can switch back to block mode at any time by clicking in the top-right corner. Ok, let's give typing a try! And if you make mistakes, don't get frustrated. It takes everybody a few tries to get it right."
     starwars_events:
       1:
         image: 'notes/starwars_events_1.png'
@@ -1381,7 +1381,7 @@ en:
         text: "Congratulations! You did it. You programmed BB-8. Now I think we're ready for something harder. Let's go for it. Now that you've learned the basics of programming, we're going to go back in time to build your own game, starring R2-D2 and C-3PO. To make a game, we need to learn about something that game programmers use every day: they're called events. Events tell your program to listen or wait for when something happens and then when it does, it performs an action. Some examples of events are listening for a mouse click, an arrow button or a tap on the screen."
       3:
         image: 'notes/starwars_events_3.png'
-        text: "Here, we're going to make R2-D2 move up to deliver a message to a Rebel Pilot and then move down to the other Rebel Pilot. We'll use events to make him move. When the player uses the up/down arrow keys or the up/down buttons, we use the when event block and attach the go up block to it. When the player presses the up arrow key, the code attached to the when up block is run. And we'll do the same thing to make R2-D2 move down."
+        text: "Here, we're going to make R2-D2 move up to deliver a message to a Rebel Pilot and then move down to the other Rebel Pilot. We'll use events to make him move. When the player uses the up/down arrow keys or the up/down buttons, we use the whenEvent() block and attach the go up block to it. When the player presses the up arrow key, the code attached to the when up block is run. And we'll do the same thing to make R2-D2 move down."
       4:
         image: 'notes/starwars_events_4.png'
         text: "To do this, we'll use a command called when up. When you drag the command out of the toolbox, you'll see that it starts and ends with a curly bracket instead of a semi-colon. This gives us space to put other commands in the middle. Every command that we place inside these brackets will run when the player presses the up arrow. We want R2-D2 to go up so let's put a go up block inside the command. And we'll do the same thing to make R2-D2 go down."
@@ -1400,7 +1400,7 @@ en:
         text: "[students speaking] We made a game where you can't lose and everything you kill gives you points. For my program, I reversed the keys so that whenever you click up, your character goes down and when you click right, your character goes left. It's really hard! Sometimes you just get an advantage, an inherent advantage if you're the developer of the game. Did I get it? Yay!"
       4:
         image: 'notes/starwars_congrats_4.png'
-        text: "When you're done making your game, choose share to get a link you can share with friends or play your  game on your phone. Have fun!"
+        text: "When you're done making your game, choose share to get a link you can share with friends or play your game on your phone. Have fun!"
     starwars_blocks_intro:
       1:
         image: 'notes/starwars_blocks_intro_1.png'
@@ -1416,10 +1416,10 @@ en:
         text: "Your screen is split into three parts. On the left is the Star Wars game space where code will run. The instructions for each level are written below the game space. This middle area is the toolbox and each of these blocks is a command that BB-8 can understand. The white space on the right is called the work space and this is where we're going to build our program."
       5:
         image: 'notes/starwars_blocks_intro_5.png'
-        text: "If I drag the moveLeft block to our workspace, what happens? BB-8 moves left one block on the grid. And what if I want BB-8 to do something after the move left block? I can add another block to our program. I'm going to choose the moveUp block and I'll drag it under my moveLeft block until the highlight appears. Then I'll drop it and the two blocks will snap together."
+        text: "If I drag the moveLeft(); block to our workspace, what happens? BB-8 moves left one block on the grid. And what if I want BB-8 to do something after the moveLeft(); block? I can add another block to our program. I'm going to choose the moveUp(); block and I'll drag it under my moveLeft(); block until the highlight appears. Then I'll drop it and the two blocks will snap together."
       6:
         image: 'notes/starwars_blocks_intro_6.png'
-        text: "When I press run again, BB-8 will perform the commands that are stacked top to bottom on our workspace. If you ever want to delete a block, just remove it from the stack and drag it back into the toolbox. After you hit run, you can always hit the reset button to get BB-8 back to the start. Now let's get rolling!"
+        text: "When I press Run again, BB-8 will perform the commands that are stacked top to bottom on our workspace. If you ever want to delete a block, just remove it from the stack and drag it back into the toolbox. After you hit Run, you can always hit the Reset button to get BB-8 back to the start. Now let's get rolling!"
     starwars_blocks_events:
       1:
         image: 'notes/starwars_blocks_events_1.png'
@@ -1432,7 +1432,7 @@ en:
         text: "Events tell your program to listen or wait for when something happens and then when it does, it performs an action. Some examples of events are listening for a mouse click, an arrow button or a tap on the screen. Here we're going to make R2-D2 move up to deliver a message to a rebel pilot and then move down to the other rebel pilot."
       4:
         image: 'notes/starwars_blocks_events_4.png'
-        text: "We'll use events to make him move. When the player uses the up/down arrow keys, or the up/down buttons. We use the when up event block and attach the go up block to it. When the player presses the up arrow key, the code attached to the when up block is run. And we'll do the same thing to make R2-D2 move down."
+        text: "We'll use events to make him move. When the player uses the up/down arrow keys, or the up/down buttons. We use the whenUp() event block and attach the go up block to it. When the player presses the up arrow key, the code attached to the when up block is run. And we'll do the same thing to make R2-D2 move down."
       5:
         image: 'notes/starwars_blocks_events_5.png'
         text: "Now instead of writing all the code to control our droid in advance, we can let R2-D2 react to button press events that move him around the screen. Step by step, your game is getting more interactive."
@@ -1448,7 +1448,7 @@ en:
         text: "[students speaking] We made a game where you can't lose and everything you kill gives you points. For my program, I reversed the keys so that whenever you click up, your character goes down and when you click right, your character goes left. It's really hard! Sometimes you just get an advantage, an inherent advantage if you're the developer of the game. Did I get it? Yay!"
       4:
         image: 'notes/starwars_blocks_congrats_4.png'
-        text: "When you're done making your game, choose share to get a link you can share with friends or play your  game on your phone. Have fun!"
+        text: "When you're done making your game, choose share to get a link you can share with friends or play your game on your phone. Have fun!"
     mc_intro:
       1:
         image: 'notes/mc_intro_1.jpg'
@@ -1464,7 +1464,7 @@ en:
         text: "Your screen is split into three main parts. On the left is the Minecraft playspace where your program will run. The instructions for each level are written below. This middle area is the toolbox and each of these blocks is a command that directs Alex's actions. The white space on the right is called the work space and this is where we'll build our program."
       5:
         image: 'notes/mc_intro_5.jpg'
-        text: "If we drag the move forward block to our workspace and then click run, what happens? Alex moves forward one space on the grid. And what if we want to do something after she has moved forward one space? We can add another block to our program. I'm going to choose the turn right block and I'll drag it underneath my move block until this orange line appears. Then I'll drop it and the two blocks will snap together. When we press run again, Alex will perform the commands that are stacked from top to bottom in our workspace."
+        text: "If we drag the moveForward(); block to our workspace and then click run, what happens? Alex moves forward one space on the grid. And what if we want to do something after she has moved forward one space? We can add another block to our program. I'm going to choose the turnRight(); block and I'll drag it underneath my moveForward(); block until this orange line appears. Then I'll drop it and the two blocks will snap together. When we press run again, Alex will perform the commands that are stacked from top to bottom in our workspace."
       6:
         image: 'notes/mc_intro_6.jpg'
         text: "If you ever want to delete a block, just drag it from the stack back to the toolbox. To undo your changes and get back to how the level started, use the Start Over button in the top right corner of the workspace. One more thing: you see the little triangle on the turn blocks? Anytime you see these triangles, it means that you can pick a different option. Let's start coding!"
