add back removed things except for css

ocadotechnology · Apr 26, 2024 · c134e22 · c134e22
1 parent f352c87
commit c134e22
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/game/static/game/js/blockly/msg/js/en-gb.js b/game/static/game/js/blockly/msg/js/en-gb.js
@@ -433,4 +433,7 @@ Blockly.Msg["VARIABLES_HUE"] = "330";
 Blockly.Msg["TEXTS_HUE"] = "160";
 Blockly.Msg["PROCEDURES_HUE"] = "290";
 Blockly.Msg["COLOUR_HUE"] = "20";
-Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+
+Blockly.Msg["MOVE_FORWARDS_TITLE"] = "move forwards but British";
+Blockly.Msg["MOVE_FORWARDS_TOOLTIP"] = "Move the van forwards but British";
diff --git a/game/static/game/js/blockly/msg/js/en.js b/game/static/game/js/blockly/msg/js/en.js
@@ -433,4 +433,7 @@ Blockly.Msg["VARIABLES_HUE"] = "330";
 Blockly.Msg["TEXTS_HUE"] = "160";
 Blockly.Msg["PROCEDURES_HUE"] = "290";
 Blockly.Msg["COLOUR_HUE"] = "20";
-Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+
+Blockly.Msg["MOVE_FORWARDS_TITLE"] = "move forwards";
+Blockly.Msg["MOVE_FORWARDS_TOOLTIP"] = "Move the van forwards";
diff --git a/game/static/game/js/blockly/msg/js/fr.js b/game/static/game/js/blockly/msg/js/fr.js
@@ -433,4 +433,7 @@ Blockly.Msg["VARIABLES_HUE"] = "330";
 Blockly.Msg["TEXTS_HUE"] = "160";
 Blockly.Msg["PROCEDURES_HUE"] = "290";
 Blockly.Msg["COLOUR_HUE"] = "20";
-Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+Blockly.Msg["VARIABLES_DYNAMIC_HUE"] = "310";
+
+Blockly.Msg["MOVE_FORWARDS_TITLE"] = "avancer";
+Blockly.Msg["MOVE_FORWARDS_TOOLTIP"] = "Faire avancer la camionnette";
diff --git a/game/static/game/js/blocklyCustomBlocks.js b/game/static/game/js/blocklyCustomBlocks.js
@@ -39,7 +39,7 @@ function initCustomBlocksDescription() {
     init: function () {
       this.setColour(160);
       this.appendDummyInput()
-        .appendField(gettext("test"))
+        .appendField(Blockly.Msg.MOVE_FORWARDS_TITLE)
         .appendField(
           new Blockly.FieldImage(
             ocargo.Drawing.imageDir + "actions/forward.svg",
@@ -49,7 +49,7 @@ function initCustomBlocksDescription() {
         );
       this.setPreviousStatement(true, "Action");
       this.setNextStatement(true, "Action");
-      this.setTooltip(gettext("test"));
+      this.setTooltip(Blockly.Msg.MOVE_FORWARDS_TOOLTIP);
     },
   };
 

diff --git a/game/templates/game/game.html b/game/templates/game/game.html
@@ -88,7 +88,6 @@
   <script defer type="text/javascript" src="{% static 'game/js/blockly/blocks_compressed.js' %}"></script>
   <script defer type="text/javascript" src="{% static 'game/js/blockly/javascript_compressed.js' %}"></script>
   <script defer type="text/javascript" src="{% static 'game/js/blockly/python_compressed.js' %}"></script>
-  <script defer type="text/javascript" src="{% static 'game/js/blockly/msg/js/en.js' %}"></script>
   <script defer type="text/javascript" src="{% static 'game/js/mobile-detect.min.js' %}"></script>
   <script defer type="text/javascript" src="{% static 'game/js/raphael.js' %}"></script>
   <script defer type="text/javascript" src="{% static 'game/js/howler.js' %}"></script>