diff --git a/src/locales/en.json b/src/locales/en.json index b461dee8..a25dd0a6 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -445,7 +445,6 @@ "Create Allowed Address Pair": "Create Allowed Address Pair", "Create Application Credentials": "Create Application Credentials", "Create Backup": "Create Backup", - "Create Backups": "Create Backups", "Create Bandwidth Limit Rule": "Create Bandwidth Limit Rule", "Create Bare Metal Node": "Create Bare Metal Node", "Create Capsule": "Create Capsule", @@ -459,6 +458,7 @@ "Create DNAT rule": "Create DNAT rule", "Create DSCP Marking Rule": "Create DSCP Marking Rule", "Create Database": "Create Database", + "Create Database Backup": "Create Database Backup", "Create Database Instance": "Create Database Instance", "Create Default Pool": "Create Default Pool", "Create Domain": "Create Domain", @@ -586,8 +586,11 @@ "Data Disks": "Data Disks", "Data Source Type": "Data Source Type", "Database": "Database", + "Database Backup Detail": "Database Backup Detail", + "Database Flavor": "Database Flavor", "Database Instance": "Database Instance", "Database Instance Detail": "Database Instance Detail", + "Database Instance Name": "Database Instance Name", "Database Instance Status": "Database Instance Status", "Database Name": "Database Name", "Database Port": "Database Port", @@ -620,6 +623,7 @@ "Delete DNAT Rule": "Delete DNAT Rule", "Delete DSCP Marking Rules": "Delete DSCP Marking Rules", "Delete Database": "Delete Database", + "Delete Database Backup": "Delete Database Backup", "Delete Default Pool": "Delete Default Pool", "Delete Domain": "Delete Domain", "Delete Encryption": "Delete Encryption", @@ -1190,7 +1194,6 @@ "Instance ID": "Instance ID", "Instance IP": "Instance IP", "Instance Info": "Instance Info", - "Instance Name": "Instance Name", "Instance Snapshot": "Instance Snapshot", "Instance Snapshot Detail": "Instance Snapshot Detail", "Instance Snapshot Name": "Instance Snapshot Name", @@ -2349,7 +2352,6 @@ "Tuvalu": "Tuvalu", "Two-way authentication": "Two-way authentication", "Type": "Type", - "Type of datastore": "Type of datastore", "UDPLite": "UDPLite", "UNHEALTHY": "UNHEALTHY", "UNKNOWN": "UNKNOWN", @@ -2480,7 +2482,6 @@ "Vendor Interface": "Vendor Interface", "Venezuela": "Venezuela", "Verifying": "Verifying", - "Version of datastore": "Version of datastore", "Vietnam": "Vietnam", "View": "View", "View Detail": "View Detail", @@ -2569,7 +2570,7 @@ "authorized by group ": "authorized by group ", "availability zones": "availability zones", "available": "available", - "backups": "backups", + "backup": "backup", "bare metal node": "bare metal node", "bare metal nodes": "bare metal nodes", "be copied": "be copied", @@ -2621,6 +2622,8 @@ "create vpn ike policy": "create vpn ike policy", "create vpn ipsec policy": "create vpn ipsec policy", "data": "data", + "database backups": "database backups", + "database instances": "database instances", "delete": "delete", "delete DNAT rule": "delete DNAT rule", "delete allowed address pair": "delete allowed address pair", diff --git a/src/locales/zh.json b/src/locales/zh.json index 16b633f7..bdd058f5 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -445,7 +445,6 @@ "Create Allowed Address Pair": "创建可用地址对", "Create Application Credentials": "创建应用凭证", "Create Backup": "创建备份", - "Create Backups": "创建备份", "Create Bandwidth Limit Rule": "创建带宽限制规则", "Create Bare Metal Node": "创建裸机节点", "Create Capsule": "创建集合", @@ -459,6 +458,7 @@ "Create DNAT rule": "创建DNAT规则", "Create DSCP Marking Rule": "创建DSCP标记规则", "Create Database": "创建数据库", + "Create Database Backup": "创建数据库备份", "Create Database Instance": "创建数据库实例", "Create Default Pool": "创建资源池", "Create Domain": "创建域", @@ -586,8 +586,11 @@ "Data Disks": "块数据盘", "Data Source Type": "数据源类型", "Database": "数据库", + "Database Backup Detail": "数据库备份详情", + "Database Flavor": "数据库实例类型", "Database Instance": "数据库实例", "Database Instance Detail": "数据库实例详情", + "Database Instance Name": "数据库实例名称", "Database Instance Status": "数据库实例状态", "Database Name": "数据库名称", "Database Port": "数据库端口", @@ -620,6 +623,7 @@ "Delete DNAT Rule": "删除DNAT规则", "Delete DSCP Marking Rules": "删除DSCP标记规则", "Delete Database": "删除数据库", + "Delete Database Backup": "删除数据库备份", "Delete Default Pool": "删除资源池", "Delete Domain": "删除域", "Delete Encryption": "删除加密", @@ -1190,7 +1194,6 @@ "Instance ID": "实例ID", "Instance IP": "云主机IP", "Instance Info": "云主机信息", - "Instance Name": "云主机名称", "Instance Snapshot": "云主机快照", "Instance Snapshot Detail": "云主机快照详情", "Instance Snapshot Name": "云主机快照名称", @@ -2349,7 +2352,6 @@ "Tuvalu": "图瓦卢", "Two-way authentication": "双向认证", "Type": "类型", - "Type of datastore": "数据存储类型", "UDPLite": "", "UNHEALTHY": "不健康", "UNKNOWN": "未知", @@ -2480,7 +2482,6 @@ "Vendor Interface": "", "Venezuela": "委内瑞拉", "Verifying": "验证", - "Version of datastore": "数据存储版本", "Vietnam": "越南", "View": "查看", "View Detail": "查看详情", @@ -2569,7 +2570,7 @@ "authorized by group ": "由组授权", "availability zones": "可用域", "available": "可用", - "backups": "备份", + "backup": "备份", "bare metal node": "裸机节点", "bare metal nodes": "裸机节点", "be copied": "复制", @@ -2621,6 +2622,8 @@ "create vpn ike policy": "创建VPN IKE策略", "create vpn ipsec policy": "创建VPN IPsec策略", "data": "数据", + "database backups": "数据库备份", + "database instances": "数据库实例", "delete": "删除", "delete DNAT rule": "删除DNAT规则", "delete allowed address pair": "删除可用地址对", diff --git a/src/pages/database/containers/Backups/Detail/index.jsx b/src/pages/database/containers/Backups/Detail/index.jsx index 380c0906..8d4eeb20 100644 --- a/src/pages/database/containers/Backups/Detail/index.jsx +++ b/src/pages/database/containers/Backups/Detail/index.jsx @@ -23,7 +23,7 @@ export class BackupsDetail extends Base { } get name() { - return 'Backup Detail'; + return t('Database Backup Detail'); } get listUrl() { diff --git a/src/pages/database/containers/Backups/actions/Create.jsx b/src/pages/database/containers/Backups/actions/Create.jsx index 60543432..746e59ac 100644 --- a/src/pages/database/containers/Backups/actions/Create.jsx +++ b/src/pages/database/containers/Backups/actions/Create.jsx @@ -23,9 +23,9 @@ export class Create extends ModalAction { this.getDatabaseInstance(); } - static id = 'create-backups'; + static id = 'create-database-backup'; - static title = t('Create Backups'); + static title = t('Create Database Backup'); static get modalSize() { return 'middle'; @@ -36,7 +36,7 @@ export class Create extends ModalAction { } get name() { - return t('Create Backups'); + return t('Create Database Backup'); } static policy = 'backup:create'; @@ -62,7 +62,7 @@ export class Create extends ModalAction { return [ { name: 'name', - label: t('Backup Name'), + label: t('Name'), type: 'input', required: true, }, diff --git a/src/pages/database/containers/Backups/actions/Delete.jsx b/src/pages/database/containers/Backups/actions/Delete.jsx index 6da236ac..5d7832ca 100644 --- a/src/pages/database/containers/Backups/actions/Delete.jsx +++ b/src/pages/database/containers/Backups/actions/Delete.jsx @@ -21,11 +21,15 @@ export default class Delete extends ConfirmAction { } get title() { - return t('Delete Backup'); + return t('Delete Database Backup'); } get actionName() { - return t('Delete Backup'); + return t('Delete Database Backup'); + } + + get buttonText() { + return t('Delete'); } get isDanger() { diff --git a/src/pages/database/containers/Backups/index.jsx b/src/pages/database/containers/Backups/index.jsx index ce11b6a8..d8d2b0aa 100644 --- a/src/pages/database/containers/Backups/index.jsx +++ b/src/pages/database/containers/Backups/index.jsx @@ -24,7 +24,7 @@ export class Backups extends Base { } get name() { - return t('backups'); + return t('database backups'); } get actionConfigs() { @@ -46,7 +46,7 @@ export class Backups extends Base { getColumns = () => [ { - title: t('Backup Name'), + title: t('Name'), dataIndex: 'name', routeName: this.getRouteName('databaseBackupDetail'), }, diff --git a/src/pages/database/containers/Instances/Detail/BaseDetail.jsx b/src/pages/database/containers/Instances/Detail/BaseDetail.jsx index c010501c..5b89ece4 100644 --- a/src/pages/database/containers/Instances/Detail/BaseDetail.jsx +++ b/src/pages/database/containers/Instances/Detail/BaseDetail.jsx @@ -61,7 +61,7 @@ export class BaseDetail extends Base { get specsCard() { const options = [ { - label: t('Flavor'), + label: t('Database Flavor'), dataIndex: 'flavor', render: (value) => { return this.getLinkRender( diff --git a/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx b/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx index a0a39c99..417fe9f9 100644 --- a/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx +++ b/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx @@ -116,7 +116,7 @@ export class StepDetails extends Base { }, { name: 'instance_name', - label: t('Instance Name'), + label: t('Database Instance Name'), type: 'input', required: true, }, @@ -152,7 +152,6 @@ export class StepDetails extends Base { this.resetFormValue(['datastore_version']); }, required: true, - tip: t('Type of datastore'), }, { name: 'datastore_version', @@ -160,14 +159,13 @@ export class StepDetails extends Base { type: 'select', options: this.datastoresVersion, required: true, - tip: t('Version of datastore'), }, { type: 'divider', }, { name: 'flavor', - label: t('Flavor'), + label: t('Database Flavor'), component: this.getFlavorComponent(), wrapperCol: { xs: { diff --git a/src/pages/database/containers/Instances/index.jsx b/src/pages/database/containers/Instances/index.jsx index 49c5f415..0c545df5 100644 --- a/src/pages/database/containers/Instances/index.jsx +++ b/src/pages/database/containers/Instances/index.jsx @@ -25,7 +25,7 @@ export class Instances extends Base { } get name() { - return t('Instances'); + return t('database instances'); } get actionConfigs() { @@ -54,7 +54,7 @@ export class Instances extends Base { getColumns = () => [ { - title: t('Instance Name'), + title: t('ID/Name'), dataIndex: 'name', routeName: this.getRouteName('databaseInstanceDetail'), },