From 5ebb7525afe9f570b75e98a030c749cc898b731c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 17 二月 2025 13:24:09 +0800
Subject: [PATCH] Merge branch 'main' of http://47.97.1.152:5880/r/wms-master

---
 rsf-admin/src/i18n/en.js |   62 ++++++++++++++++++++++++++++++
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 0390e96..4780e6d 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -118,6 +118,9 @@
         config: 'Config',
         tenant: 'Tenant',
         userLogin: 'Token',
+        customer: 'Customer',
+        shipper: 'shipper',
+        matnr: 'Matnr',
     },
     table: {
         field: {
@@ -135,6 +138,7 @@
             tenant: {
                 name: "name",
                 flag: "flag",
+                root: "root",
             },
             role: {
                 name: "name",
@@ -217,17 +221,55 @@
                 result: "result",
                 userId: "user",
             },
+            customer: {
+                uuid: "uuid",
+                name: "name",
+            },
+            shipper: {
+                uuid: "uuid",
+                name: "name",
+            },
+            matnr: {
+                uuid: "uuid",
+                shipperId: "shipperId",
+                name: "name",
+                code: "code",
+                groupId: "groupId",
+                erpCode: "erpCode",
+                spec: "spec",
+                model: "model",
+                weight: "weight",
+                color: "color",
+                size: "size",
+                desc: "desc",
+                nromNum: "nromNum",
+                unit: "unit",
+                purchaseUnit: "purchaseUnit",
+                stockUnit: "stockUnit",
+                stockLeval: "stockLeval",
+                isLabelMange: "isLabelMange",
+            },
+            matnrGroup: {
+                name: "name",
+                code: "code",
+                parentId: "parentId",
+            },
         }
     },
     page: {
-        welcome: '    Welcome to the RSF Management System.',
+        welcome: {
+            index: '    Welcome to the RSF Management System.',
+            tech: '    Technology stack: Java 17, SpringBoot2.5.3, Mybatis-plus_3.4.1, Spring Security, Druid 1.2.6, Redis, Mysql5.7, Node18, ReactJs, Material UI5.16, Axios, React-Admin5.1'
+        },
         login: {
             title: 'Welcome',
             footer: 'Footer Goes Here',
             tenant: 'Company',
+            email: 'Email Address',
             username: 'Username',
             password: 'Password',
             confirmPwd: 'Confirm Password',
+            code: 'Verification Code',
             tab: {
                 login: 'SIGN IN',
                 register: 'SIGN UP',
@@ -235,6 +277,7 @@
             button: {
                 login: 'SIGN IN',
                 register: 'SIGN UP',
+                code: 'Send Code',
             },
         },
         settings: {
@@ -244,12 +287,29 @@
                 confirmNewPwd: 'Confirm Password',
                 resetBtn: 'Reset',
                 tip: {
+                    usernameLimit: 'Only 3-20 English letters or numbers are allowed. No special characters.',
                     pwdInputLimit: "New Password must be 6-13 characters long and include both letters and numbers.",
                     pwdNotSameAsOld: "New Password cannot be the same as the Current Password.",
                     pwdNotMatch: "New Password and Confirm Password do not match.",
                 }
             }
         },
+        tenant: {
+            create: {
+                title: {
+                    basic: 'Basic Information',
+                    root: 'Add Administrator',
+                    confirm: 'Confirm',
+                },
+                btn: {
+                    next: 'Next Step',
+                    back: 'Back Step',
+                },
+                tip: {
+                    onlyEn: 'Only 3-20 English letters are allowed.'
+                },
+            },
+        },
     }
 };
 

--
Gitblit v1.9.1