diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue index e2578064d7205779b8e876a726fb432bbc56ff62..aedd75c32b5f64beda60644d55a47f4c60f35481 100644 --- a/frontend/src/business/components/settings/organization/OrganizationMember.vue +++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue @@ -6,6 +6,7 @@ :create-tip="$t('member.create')" :title="$t('commons.member')"/> + diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue index 951a5e9de35d1c48153a97880cdd6162c556558c..31580f1cacde2b6be8a14109509a80e106a20688 100644 --- a/frontend/src/business/components/settings/system/Organization.vue +++ b/frontend/src/business/components/settings/system/Organization.vue @@ -32,6 +32,7 @@ :create-tip="$t('member.create')" :title="$t('commons.member')"/> + diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue index dac3154b78cf705e3276f7ea6156a32a37aa7bdb..85650c055a078802a84fa92b756407db93707b63 100644 --- a/frontend/src/business/components/settings/system/SystemWorkspace.vue +++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue @@ -90,6 +90,7 @@ :create-tip="$t('member.create')" :title="$t('commons.member')"/> + diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue index 3881cac0c782c8b4f93e29dcc3d5cdd168025788..cf7594fa990616cd8870e2e05c35457321bb9ed7 100644 --- a/frontend/src/business/components/settings/system/User.vue +++ b/frontend/src/business/components/settings/system/User.vue @@ -4,7 +4,7 @@ diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue index f767a6361ead966426786541b85502fbe2921bbd..085218e99aba15f981afb00c8ba5cb6ada8a7e91 100644 --- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue +++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue @@ -6,6 +6,7 @@ :create-tip="$t('member.create')" :title="$t('commons.member')"/> + diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index b6ffcbd4ae967c29bad6803b24aa8f53af588e67..8cbbfebd183b71ac723824b4907ae3ec0b6af37e 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -66,7 +66,6 @@ export default { 'host_cannot_be_empty': 'Host cannot be empty', 'port_cannot_be_empty': 'Port cannot be empty', 'account_cannot_be_empty': 'Account cannot be empty', - 'title': 'Title', 'custom': 'Custom', 'select_date': 'Select date', @@ -98,6 +97,8 @@ export default { 'not_performed_yet': 'Not performed yet', 'incorrect_input': 'Incorrect input', 'delete_confirm': 'Please enter the following to confirm deletion:', + 'login_username': 'ID or email', + 'input_login_username': 'Please input the user ID or email', }, workspace: { 'create': 'Create Workspace', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 165c1021c3c261ecedff44d953be66202435a43a..3b62ff3136fa0e093c43e37554eb5ac445ac49ad 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -22,9 +22,9 @@ export default { 'input_limit': '长度在 {0} 到 {1} 个字符', 'login': '登录', 'welcome': '欢迎回来,请输入用户名和密码登录MeterSphere', - 'username': '用户名', + 'username': '姓名', 'password': '密码', - 'input_username': '请输入用户名', + 'input_username': '请输入用户姓名', 'input_password': '请输入密码', 'test': '测试', 'create_time': '创建时间', @@ -97,6 +97,8 @@ export default { 'not_performed_yet': '尚未执行', 'incorrect_input': '输入内容不正确', 'delete_confirm': '请输入以下内容,确认删除:', + 'login_username': 'ID 或 邮箱', + 'input_login_username': '请输入用户 ID 或 邮箱', }, workspace: { 'create': '创建工作空间', @@ -162,7 +164,7 @@ export default { user: { 'create': '创建用户', 'modify': '修改用户', - 'input_name': '请输入用户名', + 'input_name': '请输入用户姓名', 'input_id': '请输入ID', 'input_email': '请输入邮箱', 'input_password': '请输入密码', diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue index c678dc1e59d62cb6b6ed44a6bde69f82a7bf8e67..70678633a44e86d8909a3261f763e4ab8d171663 100644 --- a/frontend/src/login/Login.vue +++ b/frontend/src/login/Login.vue @@ -16,7 +16,7 @@
- +