From 0cb816f646b57c2eb7679bde53ce8eae4da16f85 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 13:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into dev
---
rsf-admin/src/i18n/en.js | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index d35a323..c520538 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',
@@ -135,6 +137,7 @@
tenant: {
name: "name",
flag: "flag",
+ root: "root",
},
role: {
name: "name",
@@ -220,15 +223,27 @@
}
},
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',
+ },
button: {
- login: 'LOG IN',
- register: 'REGISTER',
+ login: 'SIGN IN',
+ register: 'SIGN UP',
+ code: 'Send Code',
},
},
settings: {
@@ -238,12 +253,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