test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

i18n

This commit is contained in:
shiziyuan9527 2020-05-13 18:12:15 +08:00
parent e7f854cd1f
commit a8dd83b3cc
9 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/business/components/common/components/MsDialogFooter.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">{{$t('commons.cancel')}}</el-button>
<el-button type="primary" @click="confirm" @keydown.enter.native.prevent>确 定</el-button> <el-button type="primary" @click="confirm" @keydown.enter.native.prevent>{{$t('commons.confirm')}}</el-button>
</div> </div>
</template> </template>

3
frontend/src/business/components/settings/organization/OrganizationMember.vue
View File

@ -3,7 +3,7 @@
<el-card class="table-card"> <el-card class="table-card">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="initTableData" @create="create" <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> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -111,7 +111,6 @@
data() { data() {
return { return {
result: {}, result: {},
btnTips: this.$t('member.create'),
createVisible: false, createVisible: false,
updateVisible: false, updateVisible: false,
form: {}, form: {},

7
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
View File

@ -3,7 +3,7 @@
<el-card class="table-card" v-loading="result.loading"> <el-card class="table-card" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="list" @create="create" <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> </template>
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
@ -43,7 +43,7 @@
<!-- dialog of workspace member --> <!-- dialog of workspace member -->
<el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc"> <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
<ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch" <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 --> <!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;"> <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -366,9 +366,6 @@
dialogWsMemberVisible: false, dialogWsMemberVisible: false,
dialogWsMemberAddVisible: false, dialogWsMemberAddVisible: false,
dialogWsMemberUpdateVisible: false, dialogWsMemberUpdateVisible: false,
btnTips: this.$t('workspace.create'),
dialogBtnTips: this.$t('member.create'),
addTips: this.$t('member.create'),
condition: {}, condition: {},
dialogCondition: {}, dialogCondition: {},
items: [], items: [],

6
frontend/src/business/components/settings/system/Organization.vue
View File

@ -4,7 +4,7 @@
<el-card class="table-card"> <el-card class="table-card">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="initTableData" @create="create" <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> </template>
<!-- system menu organization table--> <!-- system menu organization table-->
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
@ -30,7 +30,7 @@
<!-- dialog of organization member --> <!-- dialog of organization member -->
<el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc"> <el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc">
<ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch" <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 --> <!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%;margin-top:5px;"> <el-table :data="memberLineData" style="width: 100%;margin-top:5px;">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -201,8 +201,6 @@
dialogPageSize: 5, dialogPageSize: 5,
dialogTotal: 0, dialogTotal: 0,
currentRow: {}, currentRow: {},
btnTips: this.$t('organization.create'),
dialogBtnTips: this.$t('member.create'),
condition: {}, condition: {},
dialogCondition: {}, dialogCondition: {},
tableData: [], tableData: [],

7
frontend/src/business/components/settings/system/SystemWorkspace.vue
View File

@ -3,7 +3,7 @@
<el-card class="table-card" v-loading="result.loading"> <el-card class="table-card" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="list" @create="create" <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> </template>
<!-- workspace table --> <!-- workspace table -->
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
@ -87,7 +87,7 @@
<!-- dialog of workspace member --> <!-- dialog of workspace member -->
<el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeWsMemberDialog"> <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeWsMemberDialog">
<ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch" <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 --> <!-- organization member table -->
<el-table :data="memberLineData" style="width: 100%;margin-top: 5px;"> <el-table :data="memberLineData" style="width: 100%;margin-top: 5px;">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -420,9 +420,6 @@
dialogWsMemberVisible: false, dialogWsMemberVisible: false,
dialogWsMemberAddVisible: false, dialogWsMemberAddVisible: false,
dialogWsMemberUpdateVisible: false, dialogWsMemberUpdateVisible: false,
btnTips: this.$t('workspace.create'),
dialogBtnTips: this.$t('member.create'),
addTips: this.$t('member.create'),
condition: {}, condition: {},
dialogCondition: {}, dialogCondition: {},
items: [], items: [],

5
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -3,7 +3,7 @@
<el-card class="table-card" v-loading="result.loading"> <el-card class="table-card" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="search" @create="create" <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> </template>
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
@ -229,9 +229,6 @@
createVisible: false, createVisible: false,
infoList: [], infoList: [],
updateVisible: false, updateVisible: false,
btnTips: this.$t('test_resource_pool.create_resource_pool'),
btnTipsAdd: this.$t("commons.add"),
btnTipsDel: this.$t("commons.delete"),
queryPath: "testresourcepool/list", queryPath: "testresourcepool/list",
condition: {}, condition: {},
items: [], items: [],

3
frontend/src/business/components/settings/system/User.vue
View File

@ -4,7 +4,7 @@
<el-card class="table-card"> <el-card class="table-card">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="search" @create="create" <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> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
@ -161,7 +161,6 @@
currentPage: 1, currentPage: 1,
pageSize: 5, pageSize: 5,
total: 0, total: 0,
btnTips: this.$t('user.create'),
condition: {}, condition: {},
tableData: [], tableData: [],
form: {}, form: {},

3
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
View File

@ -3,7 +3,7 @@
<el-card class="table-card"> <el-card class="table-card">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="initTableData" @create="create" <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> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
@ -111,7 +111,6 @@
return { return {
result: {}, result: {},
form: {}, form: {},
btnTips: this.$t('member.create'),
createVisible: false, createVisible: false,
updateVisible: false, updateVisible: false,
queryPath: "/user/ws/member/list", queryPath: "/user/ws/member/list",

2
frontend/src/i18n/en-US.js
View File

@ -72,7 +72,7 @@ export default {
'select': 'Select Workspace', 'select': 'Select Workspace',
}, },
organization: { organization: {
'create': 'Create', 'create': 'Create Organization',
'modify': 'Modify', 'modify': 'Modify',
'delete_confirm': 'Are you sure you want to delete this workspace?', 'delete_confirm': 'Are you sure you want to delete this workspace?',
'input_name': 'Please enter a organization name', 'input_name': 'Please enter a organization name',