From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/locales/en-US.ts | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index ede81c1..c2c138d 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -1,9 +1,32 @@
+import map from './en-US/map';
+
export default {
+ ...map,
'commont.enter':'Please enter',
'commont.select':'Please select',
'common.submit':'Submit',
+ 'common.confirm':'Confirm',
'common.cancel':'Cancel',
'common.reset':'Reset',
+ 'common.username':'Username',
+ 'common.nickname':'Nickname',
+ 'common.sex':'Sex',
+ 'common.male':'Male',
+ 'common.female':'Female',
+ 'common.undefined':'Undefined',
+ 'common.phone':'Phone',
+ 'common.email':'Email',
+ 'common.select.cancel':'Cancel Selection',
+ 'common.realname':'Real Name',
+ 'common.idcard':'ID Number',
+ 'common.introduction':'Introduction',
+ 'common.execute':'Execute',
+ 'common.success':'Success',
+ 'common.fail':'Fail',
+ 'common.account.logout': 'Logout',
+ 'common.search.placeholder': 'Please enter search content',
+ 'common.loading.api.message': 'Calling Server...',
+ '':'',
'':'',
'':'',
'':'',
@@ -36,6 +59,16 @@
'page.permission.menu':'Menu',
'page.role.assign.ec':'Expand/Collapse',
'page.role.assign.sd':'Select All/Deselect All',
+ 'page.resetting':'Resetting',
+ 'page.reset.success':'Reset Successful',
+ 'page.reset.fail':'Reset failed, please try again!"',
+ 'page.reset.pwd':'Reset Pwd',
+ 'page.assign.role':'Assign Role',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
'':'',
'':'',
'':'',
@@ -74,4 +107,18 @@
'':'',
'':'',
'':'',
+ '':'',
+ '':'',
+ '':'',
+ 'system.dept':'Department',
+ 'system.role':'Role',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
+ '':'',
};
--
Gitblit v1.9.1