Move some items from our blocks into being translated

Author: alan412

public/locales/en/translation.json

@@ -21,6 +21,25 @@
         "search": "Search..."
     },
     "BLOCKLY":{
-        "OF_TYPE": "of type"
+        "OF_TYPE": "of type",
+        "WITH": "with",
+        "WHEN": "when",
+        "PARAMETER": "parameter",
+        "PARAMETERS_CAN_ONLY_GO_IN_THEIR_METHODS_BLOCK": "Parameters can only go in their method's block",
+        "MECHANISMS": "Mechanisms",
+        "COMPONENTS": "Components",
+        "EVENTS": "Events",
+        "EVALUATE_BUT_IGNORE_RESULT": "evaluate but ignore result",
+        "TYPE": "Type",
+        "ENABLED": "Enabled",
+        "DISPLAY_NAME": "Display Name",
+        "DISPLAY_GROUP": "Display Group",
+        "TOOLTIP":{
+            "EVALUATE_BUT_IGNORE_RESULT": "Executes the connected block and ignores the result.  Allows you to call a function and ignore the return value.",
+            "OPMODE_TYPE": "What sort of OpMode this is",
+            "OPMODE_ENABLED": "Whether the OpMode is shown on Driver Station",
+            "OPMODE_NAME": "The name shown on the Driver Station.  If blank will use the class name.",
+            "OPMODE_GROUP": "An optional group to group OpModes on Driver Station"
+        }
     }   
 }

src/blocks/mrc_event_handler.ts

@@ -65,11 +65,11 @@ const EVENT_HANDLER = {
    */
   init(this: EventHandlerBlock): void {
     this.appendDummyInput('TITLE')
-        .appendField('When')
+        .appendField(Blockly.Msg.WHEN)
         .appendField(createFieldNonEditableText('sender'), 'SENDER')
         .appendField(createFieldNonEditableText('eventName'), 'EVENT_NAME');
     this.appendDummyInput('PARAMS')
-        .appendField('with');
+        .appendField(Blockly.Msg.WITH);
     this.setOutput(false);
     this.setStyle(MRC_STYLE_EVENT_HANDLER);
     this.appendStatementInput('STACK').appendField('');

src/blocks/mrc_get_parameter.ts

@@ -49,7 +49,7 @@ const GET_PARAMETER_BLOCK = {
   init: function(this: GetParameterBlock): void {
     this.setStyle(MRC_STYLE_VARIABLES);
     this.appendDummyInput()
-        .appendField('parameter')
+        .appendField(Blockly.Msg.PARAMETER)
         .appendField(createFieldNonEditableText('parameter'), 'PARAMETER_NAME');
 
     this.setOutput(true, this.parameterType);
@@ -89,7 +89,7 @@ const GET_PARAMETER_BLOCK = {
       }
       // If we end up here it shouldn't be allowed
       block.unplug(true);
-      blockBlock.setWarningText('Parameters can only go in their method\'s block.');
+      blockBlock.setWarningText(Blockly.Msg.PARAMETERS_CAN_ONLY_GO_IN_THEIR_METHODS_BLOCK);
     }
   },
 };

src/blocks/mrc_mechanism.ts

@@ -55,7 +55,7 @@ const MECHANISM = {
     this.setStyle(MRC_STYLE_MECHANISMS);
     this.appendDummyInput()
       .appendField(new Blockly.FieldTextInput('my_mech'), 'NAME')
-      .appendField('of type')
+      .appendField(Blockly.Msg.OF_TYPE)
       .appendField(createFieldNonEditableText(''), 'TYPE');
     this.setPreviousStatement(true, OUTPUT_NAME);
     this.setNextStatement(true, OUTPUT_NAME);

src/blocks/mrc_mechanism_component_holder.ts

@@ -72,9 +72,9 @@ const MECHANISM_COMPONENT_HOLDER = {
     */
   init: function (this: MechanismComponentHolderBlock): void {
     this.setInputsInline(false);
-    this.appendStatementInput('MECHANISMS').setCheck(MECHANISM_OUTPUT).appendField('Mechanisms');
-    this.appendStatementInput('COMPONENTS').setCheck(COMPONENT_OUTPUT).appendField('Components');
-    this.appendStatementInput('EVENTS').setCheck(EVENT_OUTPUT).appendField('Events');
+    this.appendStatementInput('MECHANISMS').setCheck(MECHANISM_OUTPUT).appendField(Blockly.Msg.MECHANISMS);
+    this.appendStatementInput('COMPONENTS').setCheck(COMPONENT_OUTPUT).appendField(Blockly.Msg.COMPONENTS);
+    this.appendStatementInput('EVENTS').setCheck(EVENT_OUTPUT).appendField(Blockly.Msg.EVENTS);
 
 
     this.setOutput(false);

src/blocks/mrc_misc_evaluate_but_ignore_result.ts

@@ -31,14 +31,13 @@ export const setup = function() {
   Blockly.Blocks[BLOCK_NAME] = {
     init: function() {
       this.appendValueInput('VALUE')
-          .appendField('evaluate but ignore result')
+          .appendField(Blockly.Msg.EVALUATE_BUT_IGNORE_RESULT)
           .setAlign(Blockly.inputs.Align.RIGHT);
       this.setPreviousStatement(true);
       this.setNextStatement(true);
       this.setStyle(MRC_STYLE_MISC);
       this.setTooltip(
-          'Executes the connected block and ignores the result. ' +
-          'Allows you to call a function and ignore the return value.');
+          Blockly.Msg.EVALUATE_BUT_IGNORE_RESULT_TOOLTIP);
     },
   };
 };

src/blocks/mrc_opmode_details.ts

@@ -61,23 +61,23 @@ const OPMODE_DETAILS = {
   init: function (this: OpmodeDetailsBlock): void {
     this.setStyle(MRC_STYLE_CLASS_BLOCKS);
     this.appendDummyInput()
-      .appendField('Type')
-      .appendField(createFieldDropdown(['Auto', 'Teleop', 'Test']), 'TYPE')
+      .appendField(Blockly.Msg.TYPE)
+      .appendField(createFieldDropdown([Blockly.Msg.AUTO, Blockly.Msg.TELEOP, Blockly.Msg.TEST]), 'TYPE')
       .appendField('    ')
-      .appendField('Enabled')
+      .appendField(Blockly.Msg.ENABLED)
       .appendField(new Blockly.FieldCheckbox(true), 'ENABLED');
 
     this.appendDummyInput()
-        .appendField('Display Name')
+        .appendField(Blockly.Msg.DISPLAY_NAME)
         .appendField(new Blockly.FieldTextInput(''), 'NAME')
     this.appendDummyInput()
-        .appendField('Display Group')
+        .appendField(Blockly.Msg.DISPLAY_GROUP)
         .appendField(new Blockly.FieldTextInput(''), 'GROUP');
 
-    this.getField('TYPE')?.setTooltip('What sort of OpMode this is');
-    this.getField('ENABLED')?.setTooltip('Whether the OpMode is shown on Driver Station');
-    this.getField('NAME')?.setTooltip('The name shown on the Driver Station.  If blank will use the class name.');
-    this.getField('GROUP')?.setTooltip('An optional group to group OpModes on Driver Station');
+    this.getField('TYPE')?.setTooltip(Blockly.Msg.OPMODE_TYPE_TOOLTIP);
+    this.getField('ENABLED')?.setTooltip(Blockly.Msg.OPMODE_ENABLED_TOOLTIP);
+    this.getField('NAME')?.setTooltip(Blockly.Msg.OPMODE_NAME_TOOLTIP);
+    this.getField('GROUP')?.setTooltip(Blockly.Msg.OPMODE_GROUP_TOOLTIP);
   },
 }
 

src/blocks/tokens.ts

@@ -1,10 +1,31 @@
 import * as Blockly from 'blockly/core';
+import { M } from 'vitest/dist/chunks/reporters.d.BFLkQcL6.js';
 
 export const customTokens = (t: (key: string) => string): typeof Blockly.Msg => {
   return {
     ADD_COMMENT: t('BLOCKLY.ADD_COMMENT'),
     REMOVE_COMMENT: t('BLOCKLY.REMOVE_COMMENT'),
     DUPLICATE_COMMENT: t('BLOCKLY.DUPLICATE_COMMENT'),
     OF_TYPE: t('BLOCKLY.OF_TYPE'),
+    WITH: t('BLOCKLY.WITH'),
+    WHEN: t('BLOCKLY.WHEN'),
+    PARAMETER: t('BLOCKLY.PARAMETER'),
+    PARAMETERS_CAN_ONLY_GO_IN_THEIR_METHODS_BLOCK: t('BLOCKLY.PARAMETERS_CAN_ONLY_GO_IN_THEIR_METHODS_BLOCK'),
+    MECHANISMS: t('BLOCKLY.MECHANISMS'),
+    COMPONENTS: t('BLOCKLY.COMPONENTS'),
+    EVENTS: t('BLOCKLY.EVENTS'),
+    EVALUATE_BUT_IGNORE_RESULT: t('BLOCKLY.EVALUATE_BUT_IGNORE_RESULT'),
+    EVALUATE_BUT_IGNORE_RESULT_TOOLTIP: t('BLOCKLY.EVALUATE_BUT_IGNORE_RESULT_TOOLTIP'),
+    AUTO: t('BLOCKLY.AUTO'),
+    TELEOP: t('BLOCKLY.TELEOP'),
+    TEST: t('BLOCKLY.TEST'),
+    TYPE: t('BLOCKLY.TYPE'),
+    ENABLED: t('BLOCKLY.ENABLED'),
+    DISPLAY_NAME: t('BLOCKLY.DISPLAY_NAME'),
+    DISPLAY_GROUP: t('BLOCKLY.DISPLAY_GROUP'),
+    OPMODE_TYPE_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_TYPE_TOOLTIP'),
+    OPMODE_ENABLED_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_ENABLED_TOOLTIP'),
+    OPMODE_NAME_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_NAME_TOOLTIP'),
+    OPMODE_GROUP_TOOLTIP: t('BLOCKLY.TOOLTIP.OPMODE_GROUP_TOOLTIP'),
   };
 };