update i18n

This commit is contained in:
王振 2020-06-08 17:49:42 +08:00
parent 016e20ba60
commit 82c0d658f2
8 changed files with 14 additions and 7 deletions

View File

@ -6,6 +6,7 @@
:create-tip="$t('member.create')" :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="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/> <el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/> <el-table-column prop="phone" :label="$t('commons.phone')"/>

View File

@ -32,6 +32,7 @@
:create-tip="$t('member.create')" :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="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/> <el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/> <el-table-column prop="phone" :label="$t('commons.phone')"/>

View File

@ -90,6 +90,7 @@
:create-tip="$t('member.create')" :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="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/> <el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/> <el-table-column prop="phone" :label="$t('commons.phone')"/>

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="$t('user.create')" :title="$t('commons.member')"/> :create-tip="$t('user.create')" :title="$t('commons.user')"/>
</template> </template>
<el-table :data="tableData" style="width: 100%"> <el-table :data="tableData" style="width: 100%">

View File

@ -6,6 +6,7 @@
:create-tip="$t('member.create')" :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="id" label="ID"/>
<el-table-column prop="name" :label="$t('commons.username')"/> <el-table-column prop="name" :label="$t('commons.username')"/>
<el-table-column prop="email" :label="$t('commons.email')"/> <el-table-column prop="email" :label="$t('commons.email')"/>
<el-table-column prop="phone" :label="$t('commons.phone')"/> <el-table-column prop="phone" :label="$t('commons.phone')"/>

View File

@ -66,7 +66,6 @@ export default {
'host_cannot_be_empty': 'Host cannot be empty', 'host_cannot_be_empty': 'Host cannot be empty',
'port_cannot_be_empty': 'Port cannot be empty', 'port_cannot_be_empty': 'Port cannot be empty',
'account_cannot_be_empty': 'Account cannot be empty', 'account_cannot_be_empty': 'Account cannot be empty',
'title': 'Title', 'title': 'Title',
'custom': 'Custom', 'custom': 'Custom',
'select_date': 'Select date', 'select_date': 'Select date',
@ -98,6 +97,8 @@ export default {
'not_performed_yet': 'Not performed yet', 'not_performed_yet': 'Not performed yet',
'incorrect_input': 'Incorrect input', 'incorrect_input': 'Incorrect input',
'delete_confirm': 'Please enter the following to confirm deletion:', '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: { workspace: {
'create': 'Create Workspace', 'create': 'Create Workspace',

View File

@ -22,9 +22,9 @@ export default {
'input_limit': '长度在 {0} 到 {1} 个字符', 'input_limit': '长度在 {0} 到 {1} 个字符',
'login': '登录', 'login': '登录',
'welcome': '欢迎回来请输入用户名和密码登录MeterSphere', 'welcome': '欢迎回来请输入用户名和密码登录MeterSphere',
'username': '用户名', 'username': '名',
'password': '密码', 'password': '密码',
'input_username': '请输入用户名', 'input_username': '请输入用户名',
'input_password': '请输入密码', 'input_password': '请输入密码',
'test': '测试', 'test': '测试',
'create_time': '创建时间', 'create_time': '创建时间',
@ -97,6 +97,8 @@ export default {
'not_performed_yet': '尚未执行', 'not_performed_yet': '尚未执行',
'incorrect_input': '输入内容不正确', 'incorrect_input': '输入内容不正确',
'delete_confirm': '请输入以下内容,确认删除:', 'delete_confirm': '请输入以下内容,确认删除:',
'login_username': 'ID 或 邮箱',
'input_login_username': '请输入用户 ID 或 邮箱',
}, },
workspace: { workspace: {
'create': '创建工作空间', 'create': '创建工作空间',
@ -162,7 +164,7 @@ export default {
user: { user: {
'create': '创建用户', 'create': '创建用户',
'modify': '修改用户', 'modify': '修改用户',
'input_name': '请输入用户名', 'input_name': '请输入用户名',
'input_id': '请输入ID', 'input_id': '请输入ID',
'input_email': '请输入邮箱', 'input_email': '请输入邮箱',
'input_password': '请输入密码', 'input_password': '请输入密码',

View File

@ -16,7 +16,7 @@
</div> </div>
<div class="form"> <div class="form">
<el-form-item prop="username"> <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>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input v-model="form.password" :placeholder="$t('commons.password')" show-password autocomplete="off" <el-input v-model="form.password" :placeholder="$t('commons.password')" show-password autocomplete="off"
@ -64,7 +64,7 @@
}, },
rules: { rules: {
username: [ username: [
{required: true, message: this.$t('commons.input_username'), trigger: 'blur'}, {required: true, message: this.$t('commons.input_login_username'), trigger: 'blur'},
], ],
password: [ password: [
{required: true, message: this.$t('commons.input_password'), trigger: 'blur'}, {required: true, message: this.$t('commons.input_password'), trigger: 'blur'},