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 | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index e95ce30..c2c138d 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -1,7 +1,11 @@
+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',
@@ -12,9 +16,16 @@
'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...',
'':'',
'':'',
'':'',
--
Gitblit v1.9.1