Merge pull request #13982 from code-dot-org/order-i18n-yml

Order i18n yml hashes

bin/i18n/sync-codeorg-in

@@ -21,8 +21,8 @@ end
 def copy_to_yml(label, data, allow_full_length=false)
   args = allow_full_length ? {line_width: -1} : {}
   File.open("dashboard/config/locales/#{label}.en.yml", "w+") do |f|
-    f.write(({ "en" => { "data" => { label => data }}}).to_yaml(**args))
-    File.write(f, File.read(f))
+    data = ({ "en" => { "data" => { label => data }}}).to_yaml(**args)
+    f.write(data)
   end
 end
 
@@ -63,7 +63,7 @@ def localize_level_content
   authored_hint_pattern = /^\s*"authored_hints": "(.*?)",?\n$/
   callout_pattern = /^\s*"callout_json": "(.*?)",?\n$/
 
-  Dir.glob("dashboard/config/scripts/levels/*.level").each do |file|
+  Dir.glob("dashboard/config/scripts/levels/*.level").sort.each do |file|
     level = File.basename(file, ".*") + "_instruction"
     markdown_level = File.basename(file, ".*") + "_markdown_instruction"
     failure_message_override_level = File.basename(file, ".*") + "_failure_message_override"

dashboard/config/locales/failure_message_overrides.en.yml

@@ -40,14 +40,9 @@ en:
         should get to their flags in the same number of moves!"
       Course 4 Playlab For Loops 5b_failure_message_override: "Remember, both characters
         need to stop in the same place."
-      courseE_playLab_scaffold3_failure_message_override: "You must add two or more
-        new actors to your game and program them to move."
       Eval Strings Images .2_failure_message_override: "Make sure you append the
         string \"Universe\" to make the code create \"Hello, Universe\""
-      grade4_scaffolded_project3_failure_message_override: "You must add two or more
-        new actors that move to your game."
       Kiki_StarWars_Test_5_failure_message_override: "Game over!"
-      kikiTesta_failure_message_override: "Congratulations!  You gathered X coins!"
       MC HOC 2016 Level 1_failure_message_override: "To go on, you’ll need to collect
         wool. To collect the wool, use the arrow keys to walk to the sheep and then
         press the spacebar or click the game to shear the sheep. And, don’t forget
@@ -80,22 +75,27 @@ en:
       MC HOC 2016 New Drop_failure_message_override: "Use the arrow keys to walk
         to the sheep and press space bar or click the game board to use the sheep.
         And, don’t forget to add the 'Drop' block to your code."
-      MC HOC 2016 New pn_failure_message_override: "To go on, you’ll need to collect
-        wool. To collect the wool, use the arrow keys to walk to the sheep and then
-        press the spacebar or click the game to shear the sheep. And, don’t forget
-        to add the “Drop Wool” block to your code."
       MC HOC 2016 New Spawn_failure_message_override: "Place `spawn sheep` under
         `when run`."
       MC HOC 2016 New Walk_failure_message_override: "To open the door, press the
         space bar or touch the game board while facing it. Walk inside to continue."
+      MC HOC 2016 New pn_failure_message_override: "To go on, you’ll need to collect
+        wool. To collect the wool, use the arrow keys to walk to the sheep and then
+        press the spacebar or click the game to shear the sheep. And, don’t forget
+        to add the “Drop Wool” block to your code."
       MC HOC 2016 SCORE LEVEL_failure_message_override: "If you're having trouble
         tagging 5 Golems, try changing the score to 2 per tag."
       MC HOC 2016 Village Test_failure_message_override: "You need to make the Iron
         Golem chase and attack the zombies to win."
+      WhileAdventure_failure_message_override: "Congratulations!  You gathered X
+        coins!"
+      courseE_playLab_scaffold3_failure_message_override: "You must add two or more
+        new actors to your game and program them to move."
+      grade4_scaffolded_project3_failure_message_override: "You must add two or more
+        new actors that move to your game."
+      kikiTesta_failure_message_override: "Congratulations!  You gathered X coins!"
       sample1_failure_message_override: "Congratulations!  You gathered X coins!"
       sample4_failure_message_override: "Congratulations!  You gathered X coins!"
       sample6_failure_message_override: "Not quite.  Keep trying!  [Move to Play
         Zone]"
       sample8_failure_message_override: "Congratulations!  You gathered X coins!"
-      WhileAdventure_failure_message_override: "Congratulations!  You gathered X
-        coins!"

i18n/locales/source/dashboard/failure_message_overrides.yml

@@ -40,14 +40,9 @@ en:
         should get to their flags in the same number of moves!"
       Course 4 Playlab For Loops 5b_failure_message_override: "Remember, both characters
         need to stop in the same place."
-      courseE_playLab_scaffold3_failure_message_override: "You must add two or more
-        new actors to your game and program them to move."
       Eval Strings Images .2_failure_message_override: "Make sure you append the
         string \"Universe\" to make the code create \"Hello, Universe\""
-      grade4_scaffolded_project3_failure_message_override: "You must add two or more
-        new actors that move to your game."
       Kiki_StarWars_Test_5_failure_message_override: "Game over!"
-      kikiTesta_failure_message_override: "Congratulations!  You gathered X coins!"
       MC HOC 2016 Level 1_failure_message_override: "To go on, you’ll need to collect
         wool. To collect the wool, use the arrow keys to walk to the sheep and then
         press the spacebar or click the game to shear the sheep. And, don’t forget
@@ -80,22 +75,27 @@ en:
       MC HOC 2016 New Drop_failure_message_override: "Use the arrow keys to walk
         to the sheep and press space bar or click the game board to use the sheep.
         And, don’t forget to add the 'Drop' block to your code."
-      MC HOC 2016 New pn_failure_message_override: "To go on, you’ll need to collect
-        wool. To collect the wool, use the arrow keys to walk to the sheep and then
-        press the spacebar or click the game to shear the sheep. And, don’t forget
-        to add the “Drop Wool” block to your code."
       MC HOC 2016 New Spawn_failure_message_override: "Place `spawn sheep` under
         `when run`."
       MC HOC 2016 New Walk_failure_message_override: "To open the door, press the
         space bar or touch the game board while facing it. Walk inside to continue."
+      MC HOC 2016 New pn_failure_message_override: "To go on, you’ll need to collect
+        wool. To collect the wool, use the arrow keys to walk to the sheep and then
+        press the spacebar or click the game to shear the sheep. And, don’t forget
+        to add the “Drop Wool” block to your code."
       MC HOC 2016 SCORE LEVEL_failure_message_override: "If you're having trouble
         tagging 5 Golems, try changing the score to 2 per tag."
       MC HOC 2016 Village Test_failure_message_override: "You need to make the Iron
         Golem chase and attack the zombies to win."
+      WhileAdventure_failure_message_override: "Congratulations!  You gathered X
+        coins!"
+      courseE_playLab_scaffold3_failure_message_override: "You must add two or more
+        new actors to your game and program them to move."
+      grade4_scaffolded_project3_failure_message_override: "You must add two or more
+        new actors that move to your game."
+      kikiTesta_failure_message_override: "Congratulations!  You gathered X coins!"
       sample1_failure_message_override: "Congratulations!  You gathered X coins!"
       sample4_failure_message_override: "Congratulations!  You gathered X coins!"
       sample6_failure_message_override: "Not quite.  Keep trying!  [Move to Play
         Zone]"
       sample8_failure_message_override: "Congratulations!  You gathered X coins!"
-      WhileAdventure_failure_message_override: "Congratulations!  You gathered X
-        coins!"