From 128dfa5e1407751bc208c1999930b14c3eb864d8 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 14:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/en.js | 88 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index a31fa3a..8202d8b 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -107,6 +107,8 @@
menu: {
dashboard: 'Dashboard',
settings: 'Settings',
+ pakin: 'Pakin',
+ basicSettings: 'Basic Setting',
system: 'System',
user: 'User',
role: 'Role',
@@ -118,6 +120,11 @@
config: 'Config',
tenant: 'Tenant',
userLogin: 'Token',
+ customer: 'Customer',
+ shipper: 'shipper',
+ matnr: 'Matnr',
+ matnrGroup: 'MatnrGroup',
+
},
table: {
field: {
@@ -135,6 +142,7 @@
tenant: {
name: "name",
flag: "flag",
+ root: "root",
},
role: {
name: "name",
@@ -217,17 +225,93 @@
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: {
+ 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',
+ },
button: {
- login: 'LOG IN',
- register: 'REGISTER',
+ login: 'SIGN IN',
+ register: 'SIGN UP',
+ code: 'Send Code',
+ },
+ },
+ settings: {
+ resetPwd: {
+ currPwd: 'Current Password',
+ newPwd: 'New Password',
+ 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