From a8dd83b3cce786e572226960b8a6c8201f2f8886 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 13 May 2020 18:12:15 +0800
Subject: [PATCH] i18n

---
 .../components/common/components/MsDialogFooter.vue        | 4 ++--
 .../settings/organization/OrganizationMember.vue           | 3 +--
 .../settings/organization/OrganizationWorkspace.vue        | 7 ++-----
 .../business/components/settings/system/Organization.vue   | 6 ++----
 .../components/settings/system/SystemWorkspace.vue         | 7 ++-----
 .../components/settings/system/TestResourcePool.vue        | 5 +----
 frontend/src/business/components/settings/system/User.vue  | 3 +--
 .../components/settings/workspace/WorkspaceMember.vue      | 3 +--
 frontend/src/i18n/en-US.js                                 | 2 +-
 9 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsDialogFooter.vue b/frontend/src/business/components/common/components/MsDialogFooter.vue
index bcd271add2..261a49422f 100644
--- a/frontend/src/business/components/common/components/MsDialogFooter.vue
+++ b/frontend/src/business/components/common/components/MsDialogFooter.vue
@@ -1,8 +1,8 @@
 <template>
 
     <div class="dialog-footer">
-      <el-button @click="cancel">取 消</el-button>
-      <el-button type="primary" @click="confirm" @keydown.enter.native.prevent>确 定</el-button>
+      <el-button @click="cancel">{{$t('commons.cancel')}}</el-button>
+      <el-button type="primary" @click="confirm" @keydown.enter.native.prevent>{{$t('commons.confirm')}}</el-button>
     </div>
 
 </template>
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index c5f7a4673a..17d347d478 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="initTableData" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.member')"/>
+                         :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       </template>
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="name" :label="$t('commons.username')"/>
@@ -111,7 +111,6 @@
     data() {
       return {
         result: {},
-        btnTips: this.$t('member.create'),
         createVisible: false,
         updateVisible: false,
         form: {},
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index ba9c2fecf9..4385018046 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card" v-loading="result.loading">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="list" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.workspace')"/>
+                         :create-tip="$t('workspace.create')" :title="$t('commons.workspace')"/>
       </template>
       <el-table :data="items" style="width: 100%">
         <el-table-column prop="name" :label="$t('commons.name')"/>
@@ -43,7 +43,7 @@
     <!-- dialog of workspace member -->
     <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
-                       :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
+                       :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="name" :label="$t('commons.username')"/>
@@ -366,9 +366,6 @@
         dialogWsMemberVisible: false,
         dialogWsMemberAddVisible: false,
         dialogWsMemberUpdateVisible: false,
-        btnTips: this.$t('workspace.create'),
-        dialogBtnTips: this.$t('member.create'),
-        addTips: this.$t('member.create'),
         condition: {},
         dialogCondition: {},
         items: [],
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index e4f4101177..e9206154c3 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -4,7 +4,7 @@
     <el-card class="table-card">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="initTableData" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.organization')"/>
+                         :create-tip="$t('organization.create')" :title="$t('commons.organization')"/>
       </template>
       <!-- system menu organization table-->
       <el-table :data="tableData" style="width: 100%">
@@ -30,7 +30,7 @@
     <!-- dialog of organization member -->
     <el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
-                       :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
+                       :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="name" :label="$t('commons.username')"/>
@@ -201,8 +201,6 @@
         dialogPageSize: 5,
         dialogTotal: 0,
         currentRow: {},
-        btnTips: this.$t('organization.create'),
-        dialogBtnTips: this.$t('member.create'),
         condition: {},
         dialogCondition: {},
         tableData: [],
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index 03268cdf60..c4e3035d39 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card" v-loading="result.loading">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="list" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.workspace')"/>
+                         :create-tip="$t('workspace.create')" :title="$t('commons.workspace')"/>
       </template>
       <!-- workspace table -->
       <el-table :data="items" style="width: 100%">
@@ -87,7 +87,7 @@
     <!-- dialog of workspace member -->
     <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeWsMemberDialog">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
-                       :create-tip="dialogBtnTips" :title="$t('commons.member')"/>
+                       :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="name" :label="$t('commons.username')"/>
@@ -420,9 +420,6 @@
         dialogWsMemberVisible: false,
         dialogWsMemberAddVisible: false,
         dialogWsMemberUpdateVisible: false,
-        btnTips: this.$t('workspace.create'),
-        dialogBtnTips: this.$t('member.create'),
-        addTips: this.$t('member.create'),
         condition: {},
         dialogCondition: {},
         items: [],
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index 056514f361..065086bc23 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card" v-loading="result.loading">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="search" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.test_resource_pool')"/>
+                         :create-tip="$t('test_resource_pool.create_resource_pool')" :title="$t('commons.test_resource_pool')"/>
       </template>
       <el-table :data="items" style="width: 100%">
         <el-table-column prop="name" :label="$t('commons.name')"/>
@@ -229,9 +229,6 @@
         createVisible: false,
         infoList: [],
         updateVisible: false,
-        btnTips: this.$t('test_resource_pool.create_resource_pool'),
-        btnTipsAdd: this.$t("commons.add"),
-        btnTipsDel: this.$t("commons.delete"),
         queryPath: "testresourcepool/list",
         condition: {},
         items: [],
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index f540a9860b..8cad4a49b3 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="btnTips" :title="$t('commons.member')"/>
+                         :create-tip="$t('user.create')" :title="$t('commons.member')"/>
       </template>
 
       <el-table :data="tableData" style="width: 100%">
@@ -161,7 +161,6 @@
         currentPage: 1,
         pageSize: 5,
         total: 0,
-        btnTips: this.$t('user.create'),
         condition: {},
         tableData: [],
         form: {},
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 0d332a6089..fa73572f22 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -3,7 +3,7 @@
     <el-card class="table-card">
       <template v-slot:header>
         <ms-table-header :condition.sync="condition" @search="initTableData" @create="create"
-                         :create-tip="btnTips" :title="$t('commons.member')"/>
+                         :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       </template>
       <el-table :data="tableData" style="width: 100%">
         <el-table-column prop="name" :label="$t('commons.username')"/>
@@ -111,7 +111,6 @@
       return {
         result: {},
         form: {},
-        btnTips: this.$t('member.create'),
         createVisible: false,
         updateVisible: false,
         queryPath: "/user/ws/member/list",
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d7e8e2bb9f..da155c593c 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -72,7 +72,7 @@ export default {
     'select': 'Select Workspace',
   },
   organization: {
-    'create': 'Create',
+    'create': 'Create Organization',
     'modify': 'Modify',
     'delete_confirm': 'Are you sure you want to delete this workspace?',
     'input_name': 'Please enter a organization name',