From 82c0d658f2adaa42eb45c00da1fef6db1227afbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=8C=AF?= <wangzhen@fit2cloud.com>
Date: Mon, 8 Jun 2020 17:49:42 +0800
Subject: [PATCH] update i18n

---
 .../settings/organization/OrganizationMember.vue          | 1 +
 .../business/components/settings/system/Organization.vue  | 1 +
 .../components/settings/system/SystemWorkspace.vue        | 1 +
 frontend/src/business/components/settings/system/User.vue | 2 +-
 .../components/settings/workspace/WorkspaceMember.vue     | 1 +
 frontend/src/i18n/en-US.js                                | 3 ++-
 frontend/src/i18n/zh-CN.js                                | 8 +++++---
 frontend/src/login/Login.vue                              | 4 ++--
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index e2578064d7..aedd75c32b 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')"/>
       </template>
       <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="id" label="ID"/>
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 951a5e9de3..31580f1cac 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')"/>
       <!-- organization member table -->
       <el-table :data="memberLineData" style="width: 100%;margin-top:5px;">
+        <el-table-column prop="id" label="ID"/>
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index dac3154b78..85650c055a 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')"/>
       <!-- organization member table -->
       <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
+        <el-table-column prop="id" label="ID"/>
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 3881cac0c7..cf7594fa99 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -4,7 +4,7 @@
     <el-card class="table-card">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="search" @create="create"
-                         :create-tip="$t('user.create')" :title="$t('commons.member')"/>
+                         :create-tip="$t('user.create')" :title="$t('commons.user')"/>
       </template>
 
       <el-table :data="tableData" style="width: 100%">
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index f767a6361e..085218e99a 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')"/>
       </template>
       <el-table :data="tableData" style="width: 100%">
+        <el-table-column prop="id" label="ID"/>
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index b6ffcbd4ae..8cbbfebd18 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 165c1021c3..3b62ff3136 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 c678dc1e59..70678633a4 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -16,7 +16,7 @@
           </div>
           <div class="form">
             <el-form-item prop="username">
-              <el-input v-model="form.username" :placeholder="$t('commons.username')" autofocus autocomplete="off"/>
+              <el-input v-model="form.username" :placeholder="$t('commons.login_username')" autofocus autocomplete="off"/>
             </el-form-item>
             <el-form-item prop="password">
               <el-input v-model="form.password" :placeholder="$t('commons.password')" show-password autocomplete="off"
@@ -64,7 +64,7 @@
         },
         rules: {
           username: [
-            {required: true, message: this.$t('commons.input_username'), trigger: 'blur'},
+            {required: true, message: this.$t('commons.input_login_username'), trigger: 'blur'},
           ],
           password: [
             {required: true, message: this.$t('commons.input_password'), trigger: 'blur'},