Merge branch 'develop' into develop-builds

Nitro-Bolt · Jul 11, 2024 · bcb612b · bcb612b
2 parents 7e31f46 + 194b492
commit bcb612b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/blocks_vertical/default_toolbox.js b/blocks_vertical/default_toolbox.js
@@ -567,7 +567,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
         '</shadow>' +
       '</value>' +
     '</block>' +
-    '<block type="json_join_object" id="json_join_object">' +
+    '<block type="json_merge_object" id="json_merge_object">' +
     '</block>' +
     '<block type="json_has_key" id="json_has_key">' +
       '<value name="KEY">' +
@@ -632,7 +632,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
         '</shadow>' +
       '</value>' +
     '</block>' +
-    '<block type="json_join_array" id="json_join_array">' +
+    '<block type="json_merge_array" id="json_merge_array">' +
     '</block>' +
     '<block type="json_has_item" id="json_has_item">' +
       '<value name="ITEM">' +

diff --git a/blocks_vertical/json.js b/blocks_vertical/json.js
@@ -204,14 +204,14 @@ Blockly.Blocks['json_delete_key'] = {
   }
 };
 
-Blockly.Blocks['json_join_object'] = {
+Blockly.Blocks['json_merge_object'] = {
   /**
    * Merges two Objects
    * @this Blockly.Block
    */
   init: function() {
     this.jsonInit({
-      "message0": Blockly.Msg.OPERATORS_JOIN,
+      "message0": Blockly.Msg.JSON_MERGE,
       "args0": [
         {
           "type": "input_value",
@@ -443,14 +443,14 @@ Blockly.Blocks['json_delete_all_occurrences'] = {
   }
 };
 
-Blockly.Blocks['json_join_array'] = {
+Blockly.Blocks['json_merge_array'] = {
   /**
    * Merges two Arrays
    * @this Blockly.Block
    */
   init: function() {
     this.jsonInit({
-      "message0": Blockly.Msg.OPERATORS_JOIN,
+      "message0": Blockly.Msg.JSON_MERGE,
       "args0": [
         {
           "type": "input_value",

diff --git a/msg/js/en.js b/msg/js/en.js
@@ -62,6 +62,7 @@ Blockly.Msg["JSON_REPLACE_INDEX"] = "replace index %1 in %2 with %3";
 Blockly.Msg["JSON_DELETE_INDEX"] = "delete index %1 from %2";
 Blockly.Msg["JSON_DELETE_ALL_OCCURRENCES"] = "delete all %1 from %2";
 Blockly.Msg["JSON_HAS_ITEM"] = "%1 has item %2?";
+Blockly.Msg["JSON_MERGE"] = "merge %1 %2";
 Blockly.Msg["JSON_OBJECT"] = '{"key":"value"}';
 Blockly.Msg["JSON_ARRAY"] = '["foo","bar"]';
 Blockly.Msg["JSON_KEY"] = "key";

diff --git a/msg/json/en.json b/msg/json/en.json
@@ -56,6 +56,7 @@
     "JSON_DELETE_INDEX": "delete index %1 from %2",
     "JSON_DELETE_ALL_OCCURRENCES": "delete all %1 from %2",
     "JSON_HAS_ITEM": "%1 has item %2?",
+    "JSON_MERGE": "merge %1 %2",
     "JSON_KEY": "key",
     "JSON_BAR": "bar",
     "JSON_BAZ": "baz",

diff --git a/msg/messages.js b/msg/messages.js
@@ -95,6 +95,7 @@ Blockly.Msg.JSON_REPLACE_INDEX = 'replace index %1 in %2 with %3';
 Blockly.Msg.JSON_DELETE_INDEX = 'delete index %1 from %2';
 Blockly.Msg.JSON_DELETE_ALL_OCCURRENCES = 'delete all %1 from %2';
 Blockly.Msg.JSON_HAS_ITEM = '%1 has item %2?';
+Blockly.Msg.JSON_MERGE = 'merge %1 %2';
 Blockly.Msg.JSON_OBJECT = '{"key":"value"}';
 Blockly.Msg.JSON_ARRAY = '["foo","bar"]';
 Blockly.Msg.JSON_KEY = 'key';