diff --git a/src/components/ActionsGroup/index.vue b/src/components/ActionsGroup/index.vue
index d89389df0..62a2c9c06 100644
--- a/src/components/ActionsGroup/index.vue
+++ b/src/components/ActionsGroup/index.vue
@@ -41,7 +41,7 @@ export default {
moreActionsTitle: {
type: String,
default() {
- return this.$ttc('moreActions')
+ return this.$t('common.moreActions')
}
}
},
@@ -66,7 +66,7 @@ export default {
return actions
},
iMoreActionsTitle() {
- return this.moreActionsTitle || this.$ttc('moreActions')
+ return this.moreActionsTitle || this.$t('common.moreActions')
}
},
mounted() {
diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index 86e213654..b648cd9f6 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -50,7 +50,7 @@ export default {
case 'actions':
col = {
prop: 'id',
- label: this.$ttc('actions'),
+ label: this.$t('common.actions'),
align: 'center',
formatter: ActionsFormatter,
width: '150px',
@@ -58,7 +58,7 @@ export default {
}
break
case 'is_valid':
- col.label = this.$ttc('validity')
+ col.label = this.$t('common.validity')
col.formatter = BooleanFormatter
col.align = 'center'
col.width = '80px'
diff --git a/src/components/DataForm/index.vue b/src/components/DataForm/index.vue
index 5e2effe33..d196f06a6 100644
--- a/src/components/DataForm/index.vue
+++ b/src/components/DataForm/index.vue
@@ -14,8 +14,8 @@
{{ button.title }}
- {{ $ttc('reset') }}
- {{ $ttc('submit') }}
+ {{ $t('common.reset') }}
+ {{ $t('common.submit') }}
diff --git a/src/components/DataZTree/components/ZTree/index.vue b/src/components/DataZTree/components/ZTree/index.vue
index 415143f27..b09a6b067 100644
--- a/src/components/DataZTree/components/ZTree/index.vue
+++ b/src/components/DataZTree/components/ZTree/index.vue
@@ -53,7 +53,7 @@ export default {
}
if (res.length === 0) {
res.push({
- name: this.$tco('empty')
+ name: this.$t('common.empty')
})
}
this.zTree = $.fn.zTree.init($('#ztree'), this.treeSetting, res)
diff --git a/src/components/DetailCard/index.vue b/src/components/DetailCard/index.vue
index 2e6759418..5698b6773 100644
--- a/src/components/DetailCard/index.vue
+++ b/src/components/DetailCard/index.vue
@@ -22,7 +22,7 @@ export default {
title: {
type: String,
default() {
- return this.$ttc('basicInfo')
+ return this.$t('common.basicInfo')
}
},
items: {
diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
index 023dc4de5..a21a424ed 100644
--- a/src/components/Dialog/index.vue
+++ b/src/components/Dialog/index.vue
@@ -7,8 +7,8 @@
diff --git a/src/components/DialogAction/index.vue b/src/components/DialogAction/index.vue
index 942af61f5..96faf4af2 100644
--- a/src/components/DialogAction/index.vue
+++ b/src/components/DialogAction/index.vue
@@ -1,6 +1,6 @@
-
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index d6198d597..057e3a652 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -7,18 +7,18 @@
diff --git a/src/views/users/groups/UserGroupDetail/GroupInfo.vue b/src/views/users/groups/UserGroupDetail/GroupInfo.vue
index 846caaa3e..705009217 100644
--- a/src/views/users/groups/UserGroupDetail/GroupInfo.vue
+++ b/src/views/users/groups/UserGroupDetail/GroupInfo.vue
@@ -27,7 +27,7 @@ export default {
return {
relationConfig: {
icon: 'fa-user',
- title: this.$ttc('members'),
+ title: this.$t('common.members'),
objectsAjax: {
url: '/api/v1/users/users/?fields_size=mini&order=name',
processResults(data) {
@@ -64,19 +64,19 @@ export default {
detailItems() {
return [
{
- key: this.$ttc('name'),
+ key: this.$t('common.name'),
value: this.object.name
},
{
- key: this.$ttc('createdBy'),
+ key: this.$t('common.createdBy'),
value: this.object.created_by
},
{
- key: this.$ttc('dateCreated'),
+ key: this.$t('common.dateCreated'),
value: this.object.date_created
},
{
- key: this.$ttc('comment'),
+ key: this.$t('common.comment'),
value: this.object.comment
}
]
diff --git a/src/views/users/groups/UserGroupDetail/index.vue b/src/views/users/groups/UserGroupDetail/index.vue
index 509e9c432..045eb2a80 100644
--- a/src/views/users/groups/UserGroupDetail/index.vue
+++ b/src/views/users/groups/UserGroupDetail/index.vue
@@ -25,11 +25,11 @@ export default {
activeMenu: 'GroupInfo',
submenu: [
{
- title: this.$ttc('basicInfo'),
+ title: this.$t('common.basicInfo'),
name: 'GroupInfo'
},
{
- title: this.$tt('users.grantedAssets'),
+ title: this.$t('users.grantedAssets'),
name: 'GroupGrantedAssets'
}
],
diff --git a/src/views/users/users/UserCreateUpdate.vue b/src/views/users/users/UserCreateUpdate.vue
index 2725f6c37..f801e7a18 100644
--- a/src/views/users/users/UserCreateUpdate.vue
+++ b/src/views/users/users/UserCreateUpdate.vue
@@ -22,7 +22,7 @@ export default {
[this.$t('users.' + 'Account'), ['name', 'username', 'email', 'groups']],
[this.$t('users.' + 'Authentication'), ['password_strategy', 'password', 'public_key', 'mfa_level', 'source']],
[this.$t('users.' + 'Secure'), ['role', 'date_expired']],
- [this.$tco('Other'), ['phone', 'wechat', 'comment']]
+ [this.$t('common.Other'), ['phone', 'wechat', 'comment']]
],
url: '/api/v1/users/users/',
fieldsMeta: {
diff --git a/src/views/users/users/UserDetail/UserInfo.vue b/src/views/users/users/UserDetail/UserInfo.vue
index f32ff4f66..280e51989 100644
--- a/src/views/users/users/UserDetail/UserInfo.vue
+++ b/src/views/users/users/UserDetail/UserInfo.vue
@@ -31,7 +31,7 @@ export default {
return {
quickActions: [
{
- title: this.$ttc('active'),
+ title: this.$t('common.active'),
type: 'switcher',
attrs: {
model: this.object.is_active
@@ -50,12 +50,12 @@ export default {
title: this.$t('users.resetMFATitle'),
attrs: {
type: 'primary',
- label: this.$ttc('reset')
+ label: this.$t('common.reset')
},
callbacks: {
click: function() {
const warnMsg = vm.$t('users.resetMFAWarningMsg')
- const warnTitle = vm.$ttc('info')
+ const warnTitle = vm.$t('common.info')
const url = `/api/v1/users/users/${vm.object.id}/otp/reset/`
const successMsg = vm.$t('users.resetMFAdSuccessMsg')
vm.$confirm(warnMsg, warnTitle, {
@@ -81,12 +81,12 @@ export default {
title: this.$t('users.resetPasswordTitle'),
attrs: {
type: 'primary',
- label: this.$ttc('send')
+ label: this.$t('common.send')
},
callbacks: {
click: function() {
const warnMsg = vm.$t('users.resetPasswordWarningMsg')
- const warnTitle = vm.$ttc('Info')
+ const warnTitle = vm.$t('common.Info')
const url = `/api/v1/users/users/${vm.object.id}/password/reset/`
const successMsg = vm.$t('users.resetPasswordSuccessMsg')
vm.$confirm(warnMsg, warnTitle, {
@@ -112,12 +112,12 @@ export default {
title: this.$t('users.resetPublicKeyTitle'),
attrs: {
type: 'primary',
- label: this.$ttc('send')
+ label: this.$t('common.send')
},
callbacks: {
click: function() {
const warnMsg = vm.$t('users.resetPublicKeyWarningMsg')
- const warnTitle = vm.$ttc('info')
+ const warnTitle = vm.$t('common.info')
const url = `/api/v1/users/users/${vm.object.id}/pubkey/reset/`
const successMsg = vm.$t('users.resetPasswordSuccessMsg')
vm.$confirm(warnMsg, warnTitle, {
@@ -140,10 +140,10 @@ export default {
}
},
{
- title: this.$tt('users.unblockUser'),
+ title: this.$t('users.unblockUser'),
attrs: {
type: 'primary',
- label: this.$ttc('unblock'),
+ label: this.$t('common.unblock'),
disabled: !this.object.login_blocked
},
callbacks: {
@@ -160,7 +160,7 @@ export default {
],
relationConfig: {
icon: 'fa-user',
- title: this.$tt('users.userGroups'),
+ title: this.$t('users.userGroups'),
objectsAjax: {
url: '/api/v1/users/groups/?fields_size=mini&order=name'
},
@@ -189,51 +189,51 @@ export default {
detailItems() {
return [
{
- key: this.$ttc('name'),
+ key: this.$t('common.name'),
value: this.object.name
},
{
- key: this.$ttc('username'),
+ key: this.$t('common.username'),
value: this.object.username
},
{
- key: this.$ttc('email'),
+ key: this.$t('common.email'),
value: this.object.email
},
{
- key: this.$ttc('role'),
+ key: this.$t('common.role'),
value: this.object.role_display
},
{
- key: this.$tt('users.MFA'),
+ key: this.$t('users.MFA'),
value: this.object.mfa_level_display
},
{
- key: this.$tt('users.source'),
+ key: this.$t('users.source'),
value: this.object.source_display
},
{
- key: this.$ttc('dateExpired'),
+ key: this.$t('common.dateExpired'),
value: this.object.date_expired
},
{
- key: this.$ttc('createdBy'),
+ key: this.$t('common.createdBy'),
value: this.object.created_by
},
{
- key: this.$ttc('dateCreated'),
+ key: this.$t('common.dateCreated'),
value: this.object.date_joined
},
{
- key: this.$tt('users.dateLastLogin'),
+ key: this.$t('users.dateLastLogin'),
value: this.object.last_login
},
{
- key: this.$tt('users.datePasswordUpdated'),
+ key: this.$t('users.datePasswordUpdated'),
value: this.object.date_password_last_updated
},
{
- key: this.$ttc('comment'),
+ key: this.$t('common.comment'),
value: this.object.comment
}
]
diff --git a/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue b/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue
index cd549d6cc..51d9d843e 100644
--- a/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue
+++ b/src/views/users/users/UserDetail/UserRemoteAppPermissionRules.vue
@@ -26,13 +26,13 @@ export default {
route: 'RemoteAppPermissionDetail'
},
users: {
- label: this.$tt('users.users'),
+ label: this.$t('users.users'),
formatter(row, col, colValue) {
return colValue.length
}
},
user_groups: {
- label: this.$tt('users.userGroups'),
+ label: this.$t('users.userGroups'),
formatter(row, col, colValue) {
return colValue.length
}
diff --git a/src/views/users/users/UserDetail/index.vue b/src/views/users/users/UserDetail/index.vue
index ee1c94b25..29555f3a8 100644
--- a/src/views/users/users/UserDetail/index.vue
+++ b/src/views/users/users/UserDetail/index.vue
@@ -35,31 +35,31 @@ export default {
activeMenu: 'UserInfo',
submenu: [
{
- title: this.$ttc('basicInfo'),
+ title: this.$t('common.basicInfo'),
name: 'UserInfo'
},
{
- title: this.$tt('perms.grantedAssets'),
+ title: this.$t('perms.grantedAssets'),
name: 'UserGrantedAssets'
},
{
- title: this.$tt('perms.assetPermissionRules'),
+ title: this.$t('perms.assetPermissionRules'),
name: 'UserAssetPermissionRules'
},
{
- title: this.$tt('perms.grantedRemoteApps'),
+ title: this.$t('perms.grantedRemoteApps'),
name: 'UserGrantedRemoteApps'
},
{
- title: this.$tt('perms.remoteAppsPermissionRules'),
+ title: this.$t('perms.remoteAppsPermissionRules'),
name: 'UserRemoteAppPermissionRules'
},
{
- title: this.$tt('perms.grantedDatabases'),
+ title: this.$t('perms.grantedDatabases'),
name: 'UserGrantedDatabases'
},
{
- title: this.$tt('perms.databasePermissionRules'),
+ title: this.$t('perms.databasePermissionRules'),
name: 'UserDatabasePermissionRules'
}
],
diff --git a/src/views/users/users/UserList.vue b/src/views/users/users/UserList.vue
index 73b53da6e..aa65e9d9f 100644
--- a/src/views/users/users/UserList.vue
+++ b/src/views/users/users/UserList.vue
@@ -33,14 +33,14 @@ export default {
extraMoreActions: [
{
name: 'disableSelected',
- title: this.$ttc('disableSelected'),
+ title: this.$t('common.disableSelected'),
callback: () => {
console.log('disableSelected')
}
},
{
name: 'activeSelected',
- title: this.$ttc('activeSelected'),
+ title: this.$t('common.activeSelected'),
callback: () => {
console.log('activeSelected')
}