Merge branch 'main' of github.com:wpilibsuite/systemcore-blocks-interface into react_components_i18n

Author: alan412

oss-attribution/attribution.txt

@@ -18,11 +18,11 @@
     "i18next": "^25.3.2",
     "i18next-http-backend": "^3.0.2",
     "jszip": "^3.10.1",
-    "lucide-react": "^0.525.0",
+    "lucide-react": "^0.544.0",
     "re-resizable": "^6.11.2",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "react-i18next": "^15.6.0",
+    "react-i18next": "^16.0.0",
     "react-syntax-highlighter": "^15.6.1",
     "semver": "^7.7.2",
     "typescript": "^5.9.2",
@@ -60,7 +60,7 @@
     "@types/node": "^24.0.15",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/semver": "^7.7.0",
-    "@vitejs/plugin-react": "^4.7.0",
+    "@vitejs/plugin-react": "^5.0.4",
     "autoprefixer": "^10.4.21",
     "playwright": "^1.54.1",
     "postcss": "^8.5.6",

oss-attribution/licenseInfos.json

@@ -30,6 +30,7 @@ import { createFieldDropdown } from '../fields/FieldDropdown';
 import { createFieldNonEditableText } from '../fields/FieldNonEditableText';
 import { MRC_STYLE_ENUM } from '../themes/styles'
 import * as toolboxItems from '../toolbox/items';
+import { replaceTokens } from './tokens';
 
 
 // A block to access a python enum.
@@ -75,7 +76,10 @@ const GET_PYTHON_ENUM_VALUE = {
     this.setTooltip(() => {
       const enumClassName = this.getFieldValue(FIELD_ENUM_CLASS_NAME);
       const enumValue = this.getFieldValue(FIELD_ENUM_VALUE);
-      let tooltip = 'Gets the enum value ' + enumClassName + '.' + enumValue + '.';
+      let tooltip = replaceTokens(Blockly.Msg['GET_ENUM_VALUE_TOOLTIP'], {
+        enumName: enumClassName,
+        valueName: enumValue
+      });
       const enumTooltip = PythonEnumTooltips[enumClassName]
       if (enumTooltip) {
         if (typeof enumTooltip === 'string') {

package-lock.json

@@ -34,6 +34,7 @@ import { createFieldDropdown } from '../fields/FieldDropdown';
 import { createFieldNonEditableText } from '../fields/FieldNonEditableText';
 import { MRC_STYLE_VARIABLES } from '../themes/styles';
 import * as toolboxItems from '../toolbox/items';
+import { replaceTokens } from './tokens';
 
 
 // A block to get a python variable.
@@ -132,7 +133,7 @@ const GET_PYTHON_VARIABLE = {
    */
   init: function(this: GetPythonVariableBlock): void {
     this.appendDummyInput('VAR')
-        .appendField('get')
+        .appendField(Blockly.Msg['GET'])
         .appendField(createFieldNonEditableText(''), FIELD_MODULE_OR_CLASS_NAME)
         .appendField('.');
     this.setStyle(MRC_STYLE_VARIABLES);
@@ -142,21 +143,30 @@ const GET_PYTHON_VARIABLE = {
       switch (this.mrcVarKind) {
         case VariableKind.MODULE: {
           const moduleName = this.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
-          tooltip = 'Gets the variable ' + moduleName + '.' + varName + '.';
+          tooltip = replaceTokens(Blockly.Msg['GET_MODULE_VARIABLE_TOOLTIP'], {
+            moduleName: moduleName,
+            varName: varName
+          });
           break;
         }
         case VariableKind.CLASS: {
           const className = this.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
-          tooltip = 'Gets the variable ' + className + '.' + varName + '.';
+          tooltip = replaceTokens(Blockly.Msg['GET_CLASS_VARIABLE_TOOLTIP'], {
+            className: className,
+            varName: varName
+          });
           break;
         }
         case VariableKind.INSTANCE: {
           const className = this.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
-          tooltip = 'Gets the variable ' + varName + ' for the given ' + className + ' object.';
+          tooltip = replaceTokens(Blockly.Msg['GET_INSTANCE_VARIABLE_TOOLTIP'], {
+            varName: varName,
+            className: className
+          });
           break;
         }
         default:
-          throw new Error('mrcVarKind must be "module", "class", or "instance".')
+          throw new Error(Blockly.Msg['VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE']);
       }
       const varTooltips = PythonVariableGetterTooltips[this.mrcKey];
       if (varTooltips) {
@@ -286,7 +296,7 @@ export const pythonFromBlock = function(
       return [code, Order.MEMBER];
     }
     default:
-      throw new Error('mrcVarKind must be "module", "class", or "instance".')
+      throw new Error(Blockly.Msg['VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE']);
   }
 };
 

package.json

@@ -74,7 +74,7 @@ const MECHANISM = {
     nameField.setValidator(this.mrcNameFieldValidator.bind(this, nameField));
     this.appendDummyInput()
       .appendField(nameField, FIELD_NAME)
-      .appendField(Blockly.Msg.OF_TYPE)
+      .appendField(Blockly.Msg['OF_TYPE'])
       .appendField(createFieldNonEditableText(''), FIELD_TYPE);
     this.setPreviousStatement(true, OUTPUT_NAME);
     this.setNextStatement(true, OUTPUT_NAME);
@@ -240,7 +240,7 @@ const MECHANISM = {
         this.updateBlock_();
       } else {
         // Did not find the mechanism.
-        warnings.push('This block refers to a mechanism that no longer exists.');
+        warnings.push(Blockly.Msg['MECHANISM_NOT_FOUND_WARNING']);
       }
     }
 

src/blocks/mrc_get_python_enum_value.ts

@@ -31,6 +31,7 @@ import { createFieldDropdown } from '../fields/FieldDropdown';
 import { createFieldNonEditableText } from '../fields/FieldNonEditableText';
 import { MRC_STYLE_VARIABLES } from '../themes/styles';
 import * as toolboxItems from '../toolbox/items';
+import { replaceTokens } from './tokens';
 
 
 // A block to set a python variable.
@@ -123,7 +124,7 @@ const SET_PYTHON_VARIABLE = {
    */
   init: function(this: SetPythonVariableBlock): void {
     this.appendValueInput('VALUE')
-        .appendField('set')
+        .appendField(Blockly.Msg['SET'])
         .appendField(createFieldNonEditableText(''), FIELD_MODULE_OR_CLASS_NAME)
         .appendField('.');
     this.setStyle(MRC_STYLE_VARIABLES);
@@ -133,21 +134,30 @@ const SET_PYTHON_VARIABLE = {
       switch (this.mrcVarKind) {
         case VariableKind.MODULE: {
           const moduleName = this.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
-          tooltip = 'Sets the variable ' + moduleName + '.' + varName + '.';
+          tooltip = replaceTokens(Blockly.Msg['SET_MODULE_VARIABLE_TOOLTIP'], {
+            moduleName: moduleName,
+            varName: varName
+          });
           break;
         }
         case VariableKind.CLASS: {
           const className = this.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
-          tooltip = 'Sets the variable ' + className + '.' + varName + '.';
+          tooltip = replaceTokens(Blockly.Msg['SET_CLASS_VARIABLE_TOOLTIP'], {
+            className: className,
+            varName: varName
+          });
           break;
         }
         case VariableKind.INSTANCE: {
           const className = this.getFieldValue(FIELD_MODULE_OR_CLASS_NAME);
-          tooltip = 'Sets the variable ' + varName + ' for the given ' + className + ' object.';
+          tooltip = replaceTokens(Blockly.Msg['SET_INSTANCE_VARIABLE_TOOLTIP'], {
+            varName: varName,
+            className: className
+          });
           break;
         }
         default:
-          throw new Error('mrcVarKind must be "module", "class", or "instance".')
+          throw new Error(Blockly.Msg['VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE']);
       }
       const varTooltips = PythonVariableSetterTooltips[this.mrcKey];
       if (varTooltips) {
@@ -226,7 +236,7 @@ const SET_PYTHON_VARIABLE = {
       } else {
         input.appendField(createFieldNonEditableText(''), FIELD_VARIABLE_NAME);
       }
-      input.appendField('to');
+      input.appendField(Blockly.Msg['TO']);
       if (this.mrcVarType) {
         input.setCheck(getAllowedTypesForSetCheck(this.mrcVarType));
       }
@@ -279,7 +289,7 @@ export const pythonFromBlock = function(
       return code;
     }
     default:
-      throw new Error('mrcVarKind must be "module", "class", or "instance".')
+      throw new Error(Blockly.Msg['VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE']);
   }
 };
 

src/blocks/mrc_get_python_variable.ts

@@ -71,6 +71,18 @@ export function customTokens(t: (key: string) => string): typeof Blockly.Msg {
     ROBOT_LOWER_CASE: t('BLOCKLY.ROBOT_LOWER_CASE'),
     CREATE: t('BLOCKLY.CREATE'),
     FIRE: t('BLOCKLY.FIRE'),
+    GET: t('BLOCKLY.GET'),
+    GET_MODULE_VARIABLE_TOOLTIP: t('BLOCKLY.TOOLTIP.GET_MODULE_VARIABLE'),
+    GET_CLASS_VARIABLE_TOOLTIP: t('BLOCKLY.TOOLTIP.GET_CLASS_VARIABLE'),
+    GET_INSTANCE_VARIABLE_TOOLTIP: t('BLOCKLY.TOOLTIP.GET_INSTANCE_VARIABLE'),
+    GET_ENUM_VALUE_TOOLTIP: t('BLOCKLY.TOOLTIP.GET_ENUM_VALUE'),
+    SET: t('BLOCKLY.SET'),
+    TO: t('BLOCKLY.TO'),
+    SET_MODULE_VARIABLE_TOOLTIP: t('BLOCKLY.TOOLTIP.SET_MODULE_VARIABLE'),
+    SET_CLASS_VARIABLE_TOOLTIP: t('BLOCKLY.TOOLTIP.SET_CLASS_VARIABLE'),
+    SET_INSTANCE_VARIABLE_TOOLTIP: t('BLOCKLY.TOOLTIP.SET_INSTANCE_VARIABLE'),
+    VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE: t('BLOCKLY.ERROR.VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE'),
+    MECHANISM_NOT_FOUND_WARNING: t('BLOCKLY.WARNING.MECHANISM_NOT_FOUND'),
     WARNING_CALL_COMPONENT_INSTANCE_METHOD_PRIVATE_COMPONENT: t('BLOCKLY.WARNING.CALL_COMPONENT_INSTANCE_METHOD_PRIVATE_COMPONENT'),
     WARNING_CALL_COMPONENT_INSTANCE_METHOD_MISSING_COMPONENT: t('BLOCKLY.WARNING.CALL_COMPONENT_INSTANCE_METHOD_MISSING_COMPONENT'),
     WARNING_CALL_MECHANISM_COMPONENT_INSTANCE_METHOD_MISSING_MECHANISM: t('BLOCKLY.WARNING.CALL_MECHANISM_COMPONENT_INSTANCE_METHOD_MISSING_MECHANISM'),
@@ -108,5 +120,23 @@ export function customTokens(t: (key: string) => string): typeof Blockly.Msg {
     MRC_CATEGORY_ADD_COMPONENT: t('BLOCKLY.CATEGORY.ADD_COMPONENT'),
     MRC_CATEGORY_TEST: t('BLOCKLY.CATEGORY.TEST'),
     MRC_PRINT: t('BLOCKLY.PRINT'),
+    CUSTOM_EVENTS_LABEL: t('BLOCKLY.CUSTOM_EVENTS_LABEL'),
+    CUSTOM_METHODS_LABEL: t('BLOCKLY.CUSTOM_METHODS_LABEL'),
+    MORE_ROBOT_METHODS_LABEL: t('BLOCKLY.MORE_ROBOT_METHODS_LABEL'),
+    MORE_MECHANISM_METHODS_LABEL: t('BLOCKLY.MORE_MECHANISM_METHODS_LABEL'),
+    MORE_OPMODE_METHODS_LABEL: t('BLOCKLY.MORE_OPMODE_METHODS_LABEL'),
+    COMMENT_DEFAULT_TEXT: t('BLOCKLY.COMMENT_DEFAULT_TEXT'),
   }
-};
+};
+
+/**
+ * Replaces tokens in a string with values from a dictionary.
+ * @param template String containing tokens in the format {{token}}
+ * @param values Dictionary mapping token names to their replacement values
+ * @return String with all tokens replaced by their corresponding values
+ */
+export function replaceTokens(template: string, values: Record<string, string>): string {
+  return template.replace(/\{\{(\w+)\}\}/g, (match, token) => {
+    return values[token] !== undefined ? values[token] : match;
+  });
+}

src/blocks/mrc_mechanism.ts

@@ -34,7 +34,6 @@
     "SPANISH": "Spanish",
     "HEBREW": "Hebrew",
     "HELP": "Help",
-    "ABOUT": "About",
     "SELECT_HIDDEN": "Select Hidden",
     "NO_HIDDEN_MECHANISMS": "No Hidden Mechanisms",
     "NO_HIDDEN_OPMODES": "No Hidden Opmodes",
@@ -78,6 +77,24 @@
     "COPY_ELLIPSIS": "Copy...",
     "MECHANISMS": "Mechanisms",    
     "OPMODES": "OpModes",
+    "ABOUT": {
+        "TITLE": "About",
+        "OK": "OK",
+        "VERSION": "Version",
+        "NAME": "Name",
+        "AUTHORS": "Authors",
+        "URL": "URL",
+        "LICENSE": "License",
+        "TAB_ATTRIBUTIONS": "Third-Party Attributions",
+        "TAB_DEPENDENCIES": "Dependencies",
+        "LOADING_ATTRIBUTIONS": "Loading attributions...",
+        "LOADING_DEPENDENCIES": "Loading dependencies...",
+        "ATTRIBUTIONS_NOT_FOUND": "Attributions file not found.",
+        "ERROR_LOADING_ATTRIBUTIONS": "Error loading attributions.",
+        "DEPENDENCIES_NOT_AVAILABLE": "Dependencies information not available.",
+        "ERROR_LOADING_DEPENDENCIES": "Error loading dependencies.",
+        "COPYRIGHT": "© 2025 FIRST. All rights reserved."
+    },
     "INVALID_CLASS_NAME": "{{name}} is not a valid name. Please enter a different name.",
     "CLASS_NAME_ALREADY_EXISTS": "Another Mechanism or OpMode is already named {{name}}. Please enter a different name.",
     "THEME_MODAL": {
@@ -125,6 +142,15 @@
         "ROBOT": "robot",
         "CREATE": "create",
         "FIRE": "fire",
+        "GET": "get",
+        "SET": "set",
+        "TO": "to",
+        "CUSTOM_EVENTS_LABEL": "Custom Events",
+        "CUSTOM_METHODS_LABEL": "Custom Methods",
+        "MORE_ROBOT_METHODS_LABEL": "More Robot Methods",
+        "MORE_MECHANISM_METHODS_LABEL": "More Mechanism Methods",
+        "MORE_OPMODE_METHODS_LABEL": "More OpMode Methods",
+        "COMMENT_DEFAULT_TEXT": "Enter your comment here!",
         "TOOLTIP":{
             "EVALUATE_BUT_IGNORE_RESULT": "Executes the connected block and ignores the result.  Allows you to call a function and ignore the return value.",
             "NONE": "Returns None.",
@@ -144,7 +170,14 @@
             "CALL_MECHANISM_COMPONENT_INSTANCE_METHOD": "Calls the instance method {{className}}.{{functionName}} on the component named {{componentName}} in the mechanism named {{mechanismName}}.",
             "CALL_COMPONENT_INSTANCE_METHOD": "Calls the instance method {{className}}.{{functionName}} on the component named {{componentName}}.",
             "CALL_ROBOT_INSTANCE_METHOD": "Calls the robot method {{functionName}}.",
-            "CALL_MECHANISM_INSTANCE_METHOD": "Calls the instance method {{className}}.{{functionName}} on the mechanism named {{mechanismName}}."
+            "CALL_MECHANISM_INSTANCE_METHOD": "Calls the instance method {{className}}.{{functionName}} on the mechanism named {{mechanismName}}.",
+            "GET_MODULE_VARIABLE": "Gets the variable {{moduleName}}.{{varName}}.",
+            "GET_CLASS_VARIABLE": "Gets the variable {{className}}.{{varName}}.",
+            "GET_INSTANCE_VARIABLE": "Gets the variable {{varName}} for the given {{className}} object.",
+            "GET_ENUM_VALUE": "Gets the enum value {{enumName}}.{{valueName}}.",
+            "SET_MODULE_VARIABLE": "Sets the variable {{moduleName}}.{{varName}}.",
+            "SET_CLASS_VARIABLE": "Sets the variable {{className}}.{{varName}}.",
+            "SET_INSTANCE_VARIABLE": "Sets the variable {{varName}} for the given {{className}} object."
         },
         "CATEGORY":{
             "LISTS": "Lists",
@@ -174,7 +207,11 @@
             "CALL_MECHANISM_INSTANCE_METHOD_INSIDE_MECHANISM": "This block is not allowed to be used inside a mechanism.",
             "CALL_MECHANISM_INSTANCE_METHOD_MISSING_METHOD": "This block calls a method that no longer exists in the mechanism.",
             "CALL_MECHANISM_INSTANCE_METHOD_MISSING_MECHANISM": "This block calls a method in a mechanism that no longer exists.",
-            "EVENT_NOT_IN_HOLDER": "This block can only go in the events section of the robot or mechanism."
+            "EVENT_NOT_IN_HOLDER": "This block can only go in the events section of the robot or mechanism.",
+            "MECHANISM_NOT_FOUND": "This block refers to a mechanism that no longer exists."
+        },
+        "ERROR":{
+            "VAR_KIND_MUST_BE_MODULE_CLASS_OR_INSTANCE": "mrcVarKind must be \"module\", \"class\", or \"instance\"."
         }
     }   
 }