Merge branch 'main' into blocks_i18n

alan412 · web-flow · commit 92b462f8610a · 2025-10-02T20:47:49.000-04:00
diff --git a/oss-attribution/attribution.txt b/oss-attribution/attribution.txt
diff --git a/oss-attribution/licenseInfos.json b/oss-attribution/licenseInfos.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",
diff --git a/src/blocks/tokens.ts b/src/blocks/tokens.ts
@@ -120,6 +120,12 @@ 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'),
   }
 };
 
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -71,6 +71,24 @@
     "NO_FILES_FOUND": "No {{type}} files found",
     "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."
+    },
     "BLOCKLY":{
         "OF_TYPE": "of type",
         "WITH": "with",
@@ -99,6 +117,12 @@
         "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.",
diff --git a/src/i18n/locales/es/translation.json b/src/i18n/locales/es/translation.json
@@ -72,6 +72,24 @@
     },
     "MECHANISMS": "Mecanismos",
     "OPMODES": "OpModes",
+    "ABOUT": {
+        "TITLE": "Acerca de",
+        "OK": "Aceptar",
+        "VERSION": "Versión",
+        "NAME": "Nombre",
+        "AUTHORS": "Autores",
+        "URL": "URL",
+        "LICENSE": "Licencia",
+        "TAB_ATTRIBUTIONS": "Atribuciones de Terceros",
+        "TAB_DEPENDENCIES": "Dependencias",
+        "LOADING_ATTRIBUTIONS": "Cargando atribuciones...",
+        "LOADING_DEPENDENCIES": "Cargando dependencias...",
+        "ATTRIBUTIONS_NOT_FOUND": "Archivo de atribuciones no encontrado.",
+        "ERROR_LOADING_ATTRIBUTIONS": "Error al cargar atribuciones.",
+        "DEPENDENCIES_NOT_AVAILABLE": "Información de dependencias no disponible.",
+        "ERROR_LOADING_DEPENDENCIES": "Error al cargar dependencias.",
+        "COPYRIGHT": "© 2025 FIRST. Todos los derechos reservados."
+    },
     "BLOCKLY": {
         "OF_TYPE": "de tipo",
         "WITH": "con",
@@ -100,6 +118,12 @@
         "GET": "obtener",
         "SET": "establecer",
         "TO": "a",
+        "CUSTOM_EVENTS_LABEL": "Eventos Personalizados",
+        "CUSTOM_METHODS_LABEL": "Métodos Personalizados",
+        "MORE_ROBOT_METHODS_LABEL": "Más Métodos del Robot",
+        "MORE_MECHANISM_METHODS_LABEL": "Más Métodos del Mecanismo",
+        "MORE_OPMODE_METHODS_LABEL": "Más Métodos del OpMode",
+        "COMMENT_DEFAULT_TEXT": "¡Ingresa tu comentario aquí!",
         "TOOLTIP": {
             "EVALUATE_BUT_IGNORE_RESULT": "Ejecuta el bloque conectado e ignora el resultado. Te permite llamar una función e ignorar el valor de retorno.",
             "NONE": "No devuelve ninguno.",
diff --git a/src/i18n/locales/he/translation.json b/src/i18n/locales/he/translation.json
@@ -71,6 +71,24 @@
     "NO_FILES_FOUND": "לא נמצאו קבצי {{type}}",
   "MECHANISMS": "מנגנונים",    
   "OPMODES": "אופמודים",
+  "ABOUT": {
+    "TITLE": "אודות",
+    "OK": "אישור",
+    "VERSION": "גרסה",
+    "NAME": "שם",
+    "AUTHORS": "מחברים",
+    "URL": "כתובת URL",
+    "LICENSE": "רישיון",
+    "TAB_ATTRIBUTIONS": "ייחוסים לצד שלישי",
+    "TAB_DEPENDENCIES": "תלויות",
+    "LOADING_ATTRIBUTIONS": "טוען ייחוסים...",
+    "LOADING_DEPENDENCIES": "טוען תלויות...",
+    "ATTRIBUTIONS_NOT_FOUND": "קובץ הייחוסים לא נמצא.",
+    "ERROR_LOADING_ATTRIBUTIONS": "שגיאה בטעינת ייחוסים.",
+    "DEPENDENCIES_NOT_AVAILABLE": "מידע על תלויות אינו זמין.",
+    "ERROR_LOADING_DEPENDENCIES": "שגיאה בטעינת תלויות.",
+    "COPYRIGHT": "© 2025 FIRST. כל הזכויות שמורות."
+  },
   "BLOCKLY": {
     "OF_TYPE": "מטיפוס",
     "WITH": "עם",
@@ -99,6 +117,12 @@
     "GET": "קבל",
     "SET": "הגדר",
     "TO": "ל",
+    "CUSTOM_EVENTS_LABEL": "אירועים מותאמים אישית",
+    "CUSTOM_METHODS_LABEL": "מתודות מותאמות אישית",
+    "MORE_ROBOT_METHODS_LABEL": "מתודות נוספות לרובוט",
+    "MORE_MECHANISM_METHODS_LABEL": "מתודות נוספות למנגנון",
+    "MORE_OPMODE_METHODS_LABEL": "מתודות נוספות לאופמוד",
+    "COMMENT_DEFAULT_TEXT": "הזן את ההערה שלך כאן!",
     "TOOLTIP": {
       "EVALUATE_BUT_IGNORE_RESULT": "מבצע את הבלוק המחובר ומתעלם מהתוצאה. מאפשר לקרוא לפונקציה מבלי להשתמש בערך שהיא מחזירה.",
       "NONE": "מחזיר כלום.",
diff --git a/src/reactComponents/AboutModal.tsx b/src/reactComponents/AboutModal.tsx
@@ -21,6 +21,7 @@
 import * as React from 'react';
 import * as Antd from 'antd';
 import { InfoCircleOutlined } from '@ant-design/icons';
+import { useTranslation } from 'react-i18next';
 
 declare const __APP_VERSION__: string;
 const __APP_NAME__ = "SystemCore Blocks";
@@ -34,8 +35,9 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
     visible,
     onClose,
 }) => {
-    const [attributions, setAttributions] = React.useState<string>('Loading attributions...');
-    const [dependencies, setDependencies] = React.useState<string>('Loading dependencies...');
+    const { t } = useTranslation();
+    const [attributions, setAttributions] = React.useState<string>(t('ABOUT.LOADING_ATTRIBUTIONS'));
+    const [dependencies, setDependencies] = React.useState<string>(t('ABOUT.LOADING_DEPENDENCIES'));
     const attributionsFile = '/attributions.txt'; // Path to the attributions file
 
     React.useEffect(() => {
@@ -60,21 +62,21 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
                 let text = ''
 
                 licenses.forEach((licenseData) => {
-                    text += `Name: ${licenseData.name}\n`;
-                    text += `Version: ${licenseData.version}\n`;
-                    text += `Authors: ${licenseData.authors}\n`;
-                    text += `URL: ${licenseData.url}\n`;
-                    text += `License: ${licenseData.license}\n`;
+                    text += `${t('ABOUT.NAME')}: ${licenseData.name}\n`;
+                    text += `${t('ABOUT.VERSION')}: ${licenseData.version}\n`;
+                    text += `${t('ABOUT.AUTHORS')}: ${licenseData.authors}\n`;
+                    text += `${t('ABOUT.URL')}: ${licenseData.url}\n`;
+                    text += `${t('ABOUT.LICENSE')}: ${licenseData.license}\n`;
                     text += `\n`;
                 });
 
                 setAttributions(text);
             } else {
-                setAttributions('Attributions file not found.');
+                setAttributions(t('ABOUT.ATTRIBUTIONS_NOT_FOUND'));
             }
         } catch (error) {
             console.error('Error loading attributions:', error);
-            setAttributions('Error loading attributions.');
+            setAttributions(t('ABOUT.ERROR_LOADING_ATTRIBUTIONS'));
         }
     };
 
@@ -96,11 +98,11 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
                 });
                 setDependencies(depText);
             } else {
-                setDependencies('Dependencies information not available.');
+                setDependencies(t('ABOUT.DEPENDENCIES_NOT_AVAILABLE'));
             }
         } catch (error) {
             console.error('Error loading dependencies:', error);
-            setDependencies('Error loading dependencies.');
+            setDependencies(t('ABOUT.ERROR_LOADING_DEPENDENCIES'));
         }
     };
 
@@ -109,11 +111,11 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
             title={
                 <Antd.Space>
                     <InfoCircleOutlined />
-                    About
+                    {t('ABOUT.TITLE')}
                 </Antd.Space>
             }
             open={visible}
-            footer={[<Antd.Button key="submit" onClick={onClose}>OK</Antd.Button>]}
+            footer={[<Antd.Button key="submit" onClick={onClose}>{t('ABOUT.OK')}</Antd.Button>]}
             onCancel={onClose}
             onOk={onClose}
             width={600}
@@ -122,7 +124,7 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
             <Antd.Space direction="vertical" style={{ width: '100%' }} size="small">
                 <div>
                     <Antd.Typography.Title level={4}>{__APP_NAME__}</Antd.Typography.Title>
-                    <Antd.Typography.Text>Version: {__APP_VERSION__}</Antd.Typography.Text>
+                    <Antd.Typography.Text>{t('ABOUT.VERSION')}: {__APP_VERSION__}</Antd.Typography.Text>
                 </div>
 
                 <Antd.Divider style={{ margin: '8px 0' }} />
@@ -131,7 +133,7 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
                     items={[
                         {
                             key: 'attributions',
-                            label: 'Third-Party Attributions',
+                            label: t('ABOUT.TAB_ATTRIBUTIONS'),
                             children: (
                                 <Antd.Input.TextArea
                                     value={attributions}
@@ -147,7 +149,7 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
                         },
                         {
                             key: 'dependencies',
-                            label: 'Dependencies',
+                            label: t('ABOUT.TAB_DEPENDENCIES'),
                             children: (
                                 <Antd.Input.TextArea
                                     value={dependencies}
@@ -166,7 +168,7 @@ const AboutDialog: React.FC<AboutDialogProps> = ({
 
                 <div style={{ textAlign: 'center', marginTop: '16px' }}>
                     <Antd.Typography.Text type="secondary">
-                        © 2025 FIRST. All rights reserved.
+                        {t('ABOUT.COPYRIGHT')}
                     </Antd.Typography.Text>
                 </div>
             </Antd.Space>
diff --git a/src/toolbox/event_category.ts b/src/toolbox/event_category.ts
@@ -65,7 +65,7 @@ class EventsCategory {
     contents.push(
       {
         kind: 'label',
-        text: 'Custom Events',
+        text: Blockly.Msg['CUSTOM_EVENTS_LABEL'],
       },
       createCustomEventBlock(storageNames.makeUniqueName('my_event', eventNames))
     );
diff --git a/src/toolbox/methods_category.ts b/src/toolbox/methods_category.ts
@@ -81,7 +81,7 @@ class MethodsCategory {
         ];
         // Add the methods for a Robot.
         this.addClassBlocksForCurrentModule(
-            'More Robot Methods', this.robotClassBlocks, robotMethodNamesNotOverrideable,
+            Blockly.Msg['MORE_ROBOT_METHODS_LABEL'], this.robotClassBlocks, robotMethodNamesNotOverrideable,
             methodNamesAlreadyOverridden, contents);
         break;
       case storageModule.ModuleType.MECHANISM:
@@ -95,13 +95,13 @@ class MethodsCategory {
         ];
         // Add the methods for a Mechanism.
         this.addClassBlocksForCurrentModule(
-            'More Mechanism Methods', this.mechanismClassBlocks, mechanismMethodNamesNotOverrideable,
+            Blockly.Msg['MORE_MECHANISM_METHODS_LABEL'], this.mechanismClassBlocks, mechanismMethodNamesNotOverrideable,
             methodNamesAlreadyOverridden, contents);
         break;
       case storageModule.ModuleType.OPMODE:
         // Add the methods for an OpMode.
         this.addClassBlocksForCurrentModule(
-            'More OpMode Methods', this.opmodeClassBlocks, [],
+            Blockly.Msg['MORE_OPMODE_METHODS_LABEL'], this.opmodeClassBlocks, [],
             methodNamesAlreadyOverridden, contents);
         break;
     }
@@ -110,7 +110,7 @@ class MethodsCategory {
     contents.push(
       {
         kind: 'label',
-        text: 'Custom Methods',
+        text: Blockly.Msg['CUSTOM_METHODS_LABEL'],
       },
       createCustomMethodBlock(),
       createCustomMethodBlockWithReturn()
diff --git a/src/toolbox/misc_category.ts b/src/toolbox/misc_category.ts
@@ -7,7 +7,7 @@ export const getCategory = () => ({
             kind: 'block',
             type: 'mrc_misc_comment',
             fields: {
-                COMMENT: 'Enter your comment here!',
+                COMMENT: Blockly.Msg['COMMENT_DEFAULT_TEXT'],
             },
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class EventsCategory {`
`65`	`65`	`contents.push(`
`66`	`66`	`{`
`67`	`67`	`kind: 'label',`
`68`		`- text: 'Custom Events',`
	`68`	`+ text: Blockly.Msg['CUSTOM_EVENTS_LABEL'],`
`69`	`69`	`},`
`70`	`70`	`createCustomEventBlock(storageNames.makeUniqueName('my_event', eventNames))`
`71`	`71`	`);`