diff --git a/src/layouts/admin-menu.jsx b/src/layouts/admin-menu.jsx index fc52d14e..6d2e9bb3 100644 --- a/src/layouts/admin-menu.jsx +++ b/src/layouts/admin-menu.jsx @@ -211,14 +211,14 @@ const renderMenu = (t) => { }, { path: '/storage/backup-admin', - name: t('Backups'), + name: t('Volume Backups'), key: 'backupAdmin', level: 1, endpoints: 'cinder', children: [ { path: /^\/storage\/backup-admin\/detail\/.[^/]+$/, - name: t('Backup Detail'), + name: t('Volume Backup Detail'), key: 'backupDetailAdmin', level: 2, routePath: '/storage/backup-admin/detail/:id', @@ -234,7 +234,7 @@ const renderMenu = (t) => { children: [ { path: /^\/storage\/snapshot-admin\/detail\/.[^/]+$/, - name: t('Snapshot Detail'), + name: t('Volume Snapshot Detail'), key: 'snapshotDetailAdmin', level: 2, routePath: '/storage/snapshot-admin/detail/:id', diff --git a/src/layouts/menu.jsx b/src/layouts/menu.jsx index 18746114..6acbc340 100644 --- a/src/layouts/menu.jsx +++ b/src/layouts/menu.jsx @@ -185,14 +185,14 @@ const renderMenu = (t) => { }, { path: '/storage/backup', - name: t('Backups'), + name: t('Volume Backups'), key: 'backup', level: 1, endpoints: 'cinder', children: [ { path: /^\/storage\/backup\/detail\/.[^/]+$/, - name: t('Backup Detail'), + name: t('Volume Backup Detail'), key: 'backupDetail', level: 2, routePath: '/storage/backup/detail/:id', @@ -208,7 +208,7 @@ const renderMenu = (t) => { children: [ { path: /^\/storage\/snapshot\/detail\/.[^/]+$/, - name: t('Snapshot Detail'), + name: t('Volume Snapshot Detail'), key: 'snapshotDetail', level: 2, routePath: '/storage/snapshot/detail/:id', diff --git a/src/locales/en.json b/src/locales/en.json index 114db06f..b461dee8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -203,7 +203,6 @@ "Backup File Location": "Backup File Location", "Backup Mode": "Backup Mode", "Backup Name": "Backup Name", - "Backup gigabytes (GiB)": "Backup gigabytes (GiB)", "Backups": "Backups", "Backups & Snapshots": "Backups & Snapshots", "Bad Gateway (code: 502) ": "Bad Gateway (code: 502) ", @@ -473,6 +472,7 @@ "Create Image": "Create Image", "Create In Progress": "Create In Progress", "Create Instance": "Create Instance", + "Create Instance Snapshot": "Create Instance Snapshot", "Create Ironic Instance": "Create Ironic Instance", "Create Keypair": "Create Keypair", "Create Listener": "Create Listener", @@ -511,9 +511,10 @@ "Create VPN IPsec Policy": "Create VPN IPsec Policy", "Create Virtual Adapter": "Create Virtual Adapter", "Create Volume": "Create Volume", + "Create Volume Backup": "Create Volume Backup", + "Create Volume Snapshot": "Create Volume Snapshot", "Create Volume Type": "Create Volume Type", "Create a full backup, the system will automatically create a new backup chain, the full backup name is the backup chain name; Create an incremental backup, the system will automatically create an incremental backup under the newly created backup chain.": "Create a full backup, the system will automatically create a new backup chain, the full backup name is the backup chain name; Create an incremental backup, the system will automatically create an incremental backup under the newly created backup chain.", - "Create backup": "Create backup", "Create host aggregate": "Create host aggregate", "Create image": "Create image", "Create instance": "Create instance", @@ -524,6 +525,7 @@ "Create server group": "Create server group", "Create static route": "Create static route", "Create volume": "Create volume", + "Create volume backup": "Create volume backup", "Created": "Created", "Created At": "Created At", "Created Time": "Created Time", @@ -658,7 +660,6 @@ "Delete Share Network": "Delete Share Network", "Delete Share Server": "Delete Share Server", "Delete Share Type": "Delete Share Type", - "Delete Snapshot": "Delete Snapshot", "Delete Static Route": "Delete Static Route", "Delete Subnet": "Delete Subnet", "Delete Template": "Delete Template", @@ -669,6 +670,8 @@ "Delete VPN IPsec Policy": "Delete VPN IPsec Policy", "Delete Virtual Adapter": "Delete Virtual Adapter", "Delete Volume": "Delete Volume", + "Delete Volume Backup": "Delete Volume Backup", + "Delete Volume Snapshot": "Delete Volume Snapshot", "Delete Volume Type": "Delete Volume Type", "Delete metadata": "Delete metadata", "Deleted": "Deleted", @@ -765,7 +768,6 @@ "East Timor": "East Timor", "Ecuador": "Ecuador", "Edit": "Edit", - "Edit Backup": "Edit Backup", "Edit Bandwidth Egress Limit Rule": "Edit Bandwidth Egress Limit Rule", "Edit Bandwidth Ingress Limit Rule": "Edit Bandwidth Ingress Limit Rule", "Edit Bare Metal Node": "Edit Bare Metal Node", @@ -805,6 +807,7 @@ "Edit VPN EndPoint Groups": "Edit VPN EndPoint Groups", "Edit VPN IKE Policy": "Edit VPN IKE Policy", "Edit VPN IPsec Policy": "Edit VPN IPsec Policy", + "Edit Volume Backup": "Edit Volume Backup", "Edit host aggregate": "Edit host aggregate", "Edit metadata": "Edit metadata", "Edit quota": "Edit quota", @@ -1190,6 +1193,7 @@ "Instance Name": "Instance Name", "Instance Snapshot": "Instance Snapshot", "Instance Snapshot Detail": "Instance Snapshot Detail", + "Instance Snapshot Name": "Instance Snapshot Name", "Instance Status": "Instance Status", "Instances": "Instances", "Instances \"{ name }\" are locked, can not delete them.": "Instances \"{ name }\" are locked, can not delete them.", @@ -1910,6 +1914,7 @@ "Restart Policy": "Restart Policy", "Restarting": "Restarting", "Restore Backup": "Restore Backup", + "Restore From Snapshot": "Restore From Snapshot", "Restore backup": "Restore backup", "Restore from snapshot": "Restore from snapshot", "Restoring": "Restoring", @@ -1985,8 +1990,8 @@ "Select File": "Select File", "Select Project": "Select Project", "Select Project Role": "Select Project Role", - "Select Snapshot": "Select Snapshot", "Select User Group": "Select User Group", + "Select Volume Snapshot": "Select Volume Snapshot", "Select a domain": "Select a domain", "Select a region": "Select a region", "Selected": "Selected", @@ -2063,7 +2068,6 @@ "Singapore": "Singapore", "Size": "Size", "Size (GiB)": "Size (GiB)", - "Size of image to launch": "Size of image to launch", "Size(GiB)": "Size(GiB)", "Slovakia (Slovak Republic)": "Slovakia (Slovak Republic)", "Slovenia": "Slovenia", @@ -2071,14 +2075,10 @@ "Small": "Small", "Small(Not recommended)": "Small(Not recommended)", "Smart Scheduling": "Smart Scheduling", - "Snapshot": "Snapshot", "Snapshot Complete": "Snapshot Complete", - "Snapshot Detail": "Snapshot Detail", "Snapshot Failed": "Snapshot Failed", "Snapshot In Progress": "Snapshot In Progress", "Snapshot Instance": "Snapshot Instance", - "Snapshot Name": "Snapshot Name", - "Snapshots": "Snapshots", "Snapshots can be converted into volume and used to create an instance from the volume.": "Snapshots can be converted into volume and used to create an instance from the volume.", "Snapshotting": "Snapshotting", "Soft Delete Instance": "Soft Delete Instance", @@ -2499,6 +2499,10 @@ "Visualization Compute Optimized Type with GPU": "Visualization Compute Optimized Type with GPU", "Volume": "Volume", "Volume Backup": "Volume Backup", + "Volume Backup Detail": "Volume Backup Detail", + "Volume Backup Gigabytes (GiB)": "Volume Backup Gigabytes (GiB)", + "Volume Backup Name": "Volume Backup Name", + "Volume Backups": "Volume Backups", "Volume Detail": "Volume Detail", "Volume Driver": "Volume Driver", "Volume ID": "Volume ID", @@ -2507,6 +2511,9 @@ "Volume Name": "Volume Name", "Volume Size": "Volume Size", "Volume Snapshot": "Volume Snapshot", + "Volume Snapshot Detail": "Volume Snapshot Detail", + "Volume Snapshot Name": "Volume Snapshot Name", + "Volume Snapshots": "Volume Snapshots", "Volume Source": "Volume Source", "Volume Transfer": "Volume Transfer", "Volume Type": "Volume Type", @@ -2562,7 +2569,6 @@ "authorized by group ": "authorized by group ", "availability zones": "availability zones", "available": "available", - "backup": "backup", "backups": "backups", "bare metal node": "bare metal node", "bare metal nodes": "bare metal nodes", @@ -2606,9 +2612,9 @@ "create share group type": "create share group type", "create share network": "create share network", "create share type": "create share type", - "create snapshot": "create snapshot", "create stack": "create stack", "create volume": "create volume", + "create volume snapshot": "create volume snapshot", "create volume type": "create volume type", "create vpn": "create vpn", "create vpn endpoint group": "create vpn endpoint group", @@ -2619,7 +2625,6 @@ "delete DNAT rule": "delete DNAT rule", "delete allowed address pair": "delete allowed address pair", "delete application credential": "delete application credential", - "delete backup": "delete backup", "delete bandwidth egress rules": "delete bandwidth egress rules", "delete bandwidth ingress rules": "delete bandwidth ingress rules", "delete certificate": "delete certificate", @@ -2643,13 +2648,14 @@ "delete qos policy": "delete qos policy", "delete role": "delete role", "delete router": "delete router", - "delete snapshot": "delete snapshot", "delete stack": "delete stack", "delete static route": "delete static route", "delete subnet": "delete subnet", "delete user": "delete user", "delete virtual adapter": "delete virtual adapter", "delete volume": "delete volume", + "delete volume backup": "delete volume backup", + "delete volume snapshot": "delete volume snapshot", "delete vpn": "delete vpn", "delete vpn IKE policy": "delete vpn IKE policy", "delete vpn IPsec policy": "delete vpn IPsec policy", @@ -2773,7 +2779,6 @@ "share type": "share type", "share types": "share types", "shelve instance": "shelve instance", - "snapshot": "snapshot", "soft reboot instance": "soft reboot instance", "stack": "stack", "stack events": "stack events", @@ -2809,7 +2814,10 @@ "virtual adapter": "virtual adapter", "virtual adapters": "virtual adapters", "volume": "volume", + "volume backup": "volume backup", + "volume backups": "volume backups", "volume gigabytes": "volume gigabytes", + "volume snapshot": "volume snapshot", "volume snapshots": "volume snapshots", "volume type": "volume type", "volume type qos": "volume type qos", diff --git a/src/locales/zh.json b/src/locales/zh.json index 7320cbb0..16b633f7 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -203,7 +203,6 @@ "Backup File Location": "备份文件地址", "Backup Mode": "备份方式", "Backup Name": "备份名称", - "Backup gigabytes (GiB)": "备份容量 (GiB)", "Backups": "备份", "Backups & Snapshots": "备份和快照", "Bad Gateway (code: 502) ": "无效网关(错误码:502)", @@ -473,6 +472,7 @@ "Create Image": "创建镜像", "Create In Progress": "正在创建", "Create Instance": "创建云主机", + "Create Instance Snapshot": "创建云主机快照", "Create Ironic Instance": "创建裸机", "Create Keypair": "创建密钥", "Create Listener": "创建监听器", @@ -511,9 +511,10 @@ "Create VPN IPsec Policy": "创建VPN IPsec策略", "Create Virtual Adapter": "创建虚拟网卡", "Create Volume": "创建云硬盘", + "Create Volume Backup": "创建云硬盘备份", + "Create Volume Snapshot": "创建云硬盘快照", "Create Volume Type": "创建云硬盘类型", "Create a full backup, the system will automatically create a new backup chain, the full backup name is the backup chain name; Create an incremental backup, the system will automatically create an incremental backup under the newly created backup chain.": "创建全量备份后,系统会自动创建新的备份链,全量备份名称为备份链名称; 创建增量备份,系统将在新创建的备份链下的对应备份点自动创建增量备份。", - "Create backup": "创建备份", "Create host aggregate": "创建主机集合", "Create image": "创建镜像", "Create instance": "创建云主机", @@ -524,6 +525,7 @@ "Create server group": "创建云主机组", "Create static route": "创建静态路由", "Create volume": "创建云硬盘", + "Create volume backup": "创建云硬盘备份", "Created": "已创建", "Created At": "创建于", "Created Time": "创建时间", @@ -658,7 +660,6 @@ "Delete Share Network": "删除共享网络", "Delete Share Server": "删除共享服务器", "Delete Share Type": "删除共享类型", - "Delete Snapshot": "删除快照", "Delete Static Route": "删除静态路由", "Delete Subnet": "删除子网", "Delete Template": "删除模板", @@ -669,6 +670,8 @@ "Delete VPN IPsec Policy": "删除VPN IPsec策略", "Delete Virtual Adapter": "删除虚拟网卡", "Delete Volume": "删除云硬盘", + "Delete Volume Backup": "删除云硬盘备份", + "Delete Volume Snapshot": "删除云硬盘快照", "Delete Volume Type": "删除云硬盘类型", "Delete metadata": "删除元数据", "Deleted": "已删除", @@ -765,7 +768,6 @@ "East Timor": "东帝汶", "Ecuador": "厄瓜多尔", "Edit": "编辑", - "Edit Backup": "编辑备份", "Edit Bandwidth Egress Limit Rule": "编辑带宽出方向限制", "Edit Bandwidth Ingress Limit Rule": "编辑带宽入方向限制", "Edit Bare Metal Node": "编辑裸机节点", @@ -805,6 +807,7 @@ "Edit VPN EndPoint Groups": "编辑VPN端点组", "Edit VPN IKE Policy": "编辑VPN IKE策略", "Edit VPN IPsec Policy": "编辑VPN IPsec策略", + "Edit Volume Backup": "编辑云硬盘备份", "Edit host aggregate": "编辑主机集合", "Edit metadata": "编辑元数据", "Edit quota": "编辑配额", @@ -1190,6 +1193,7 @@ "Instance Name": "云主机名称", "Instance Snapshot": "云主机快照", "Instance Snapshot Detail": "云主机快照详情", + "Instance Snapshot Name": "云主机快照名称", "Instance Status": "云主机状态", "Instances": "云主机", "Instances \"{ name }\" are locked, can not delete them.": "云主机\"{ name }\"被锁定,无法删除。", @@ -1910,6 +1914,7 @@ "Restart Policy": "重启策略", "Restarting": "重启中", "Restore Backup": "恢复备份", + "Restore From Snapshot": "从快照恢复", "Restore backup": "恢复备份", "Restore from snapshot": "从快照恢复", "Restoring": "恢复中", @@ -1985,8 +1990,8 @@ "Select File": "选择文件", "Select Project": "选择项目", "Select Project Role": "选择项目角色", - "Select Snapshot": "选择快照", "Select User Group": "选择用户组", + "Select Volume Snapshot": "选择云硬盘快照", "Select a domain": "请选择Domain", "Select a region": "请选择Region", "Selected": "已选", @@ -2063,7 +2068,6 @@ "Singapore": "新加坡", "Size": "容量", "Size (GiB)": "容量 (GiB)", - "Size of image to launch": "启动的镜像大小", "Size(GiB)": "大小(GiB)", "Slovakia (Slovak Republic)": "斯洛伐克", "Slovenia": "斯洛文尼亚", @@ -2071,14 +2075,10 @@ "Small": "小", "Small(Not recommended)": "小(不推荐)", "Smart Scheduling": "智能调度", - "Snapshot": "快照", "Snapshot Complete": "生成快照完成", - "Snapshot Detail": "快照详情", "Snapshot Failed": "生成快照失败", "Snapshot In Progress": "快照进行中", "Snapshot Instance": "创建云主机快照", - "Snapshot Name": "快照名称", - "Snapshots": "快照", "Snapshots can be converted into volume and used to create an instance from the volume.": "快照可以转换成云硬盘,用于从云硬盘启动云主机。", "Snapshotting": "创建快照中", "Soft Delete Instance": "软删除云主机", @@ -2499,6 +2499,10 @@ "Visualization Compute Optimized Type with GPU": "GPU虚拟化型", "Volume": "云硬盘", "Volume Backup": "云硬盘备份", + "Volume Backup Detail": "云硬盘备份详情", + "Volume Backup Gigabytes (GiB)": "云硬盘备份容量 (GiB)", + "Volume Backup Name": "云硬盘备份名称", + "Volume Backups": "云硬盘备份", "Volume Detail": "云硬盘详情", "Volume Driver": "云硬盘驱动", "Volume ID": "云硬盘ID", @@ -2507,6 +2511,9 @@ "Volume Name": "云硬盘名称", "Volume Size": "云硬盘容量", "Volume Snapshot": "云硬盘快照", + "Volume Snapshot Detail": "云硬盘快照详情", + "Volume Snapshot Name": "云硬盘快照名称", + "Volume Snapshots": "云硬盘快照", "Volume Source": "云硬盘源", "Volume Transfer": "云硬盘传输", "Volume Type": "云硬盘类型", @@ -2562,7 +2569,6 @@ "authorized by group ": "由组授权", "availability zones": "可用域", "available": "可用", - "backup": "备份", "backups": "备份", "bare metal node": "裸机节点", "bare metal nodes": "裸机节点", @@ -2606,9 +2612,9 @@ "create share group type": "创建共享组类型", "create share network": "创建共享网络", "create share type": "创建共享类型", - "create snapshot": "创建快照", "create stack": "创建堆栈", "create volume": "创建云硬盘", + "create volume snapshot": "创建云硬盘快照", "create volume type": "创建云硬盘类型", "create vpn": "创建VPN", "create vpn endpoint group": "创建VPN端点组", @@ -2619,7 +2625,6 @@ "delete DNAT rule": "删除DNAT规则", "delete allowed address pair": "删除可用地址对", "delete application credential": "删除应用凭证", - "delete backup": "删除备份", "delete bandwidth egress rules": "删除出方向带宽限制规则", "delete bandwidth ingress rules": "删除入方向带宽限制规则", "delete certificate": "删除证书", @@ -2643,13 +2648,14 @@ "delete qos policy": "删除QoS策略", "delete role": "删除角色", "delete router": "删除路由器", - "delete snapshot": "删除快照", "delete stack": "删除stack", "delete static route": "删除静态路由", "delete subnet": "删除子网", "delete user": "删除用户", "delete virtual adapter": "删除虚拟网卡", - "delete volume": "删除硬盘", + "delete volume": "删除云硬盘", + "delete volume backup": "删除云硬盘备份", + "delete volume snapshot": "删除云硬盘快照", "delete vpn": "删除vpn", "delete vpn IKE policy": "删除vpn IKE策略", "delete vpn IPsec policy": "删除vpn IPsec策略", @@ -2773,7 +2779,6 @@ "share type": "共享类型", "share types": "共享类型", "shelve instance": "归档云主机", - "snapshot": "快照", "soft reboot instance": "软重启云主机", "stack": "stack堆栈", "stack events": "部署日志", @@ -2809,7 +2814,10 @@ "virtual adapter": "虚拟网卡", "virtual adapters": "虚拟网卡", "volume": "云硬盘", + "volume backup": "云硬盘备份", + "volume backups": "云硬盘备份", "volume gigabytes": "云硬盘容量", + "volume snapshot": "云硬盘快照", "volume snapshots": "云硬盘快照", "volume type": "云硬盘类型", "volume type qos": "云硬盘类型Qos", diff --git a/src/pages/base/containers/Overview/components/QuotaOverview.jsx b/src/pages/base/containers/Overview/components/QuotaOverview.jsx index 1d2eab7b..9b409834 100644 --- a/src/pages/base/containers/Overview/components/QuotaOverview.jsx +++ b/src/pages/base/containers/Overview/components/QuotaOverview.jsx @@ -62,15 +62,15 @@ export const quotaCardList = [ key: 'gigabytes', }, { - text: t('Snapshots'), + text: t('Volume Snapshots'), key: 'snapshots', }, { - text: t('Backups'), + text: t('Volume Backups'), key: 'backups', }, { - text: t('Backup gigabytes (GiB)'), + text: t('Volume Backup Gigabytes (GiB)'), key: 'backup_gigabytes', }, ], diff --git a/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx b/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx index 76feb3bb..9309a750 100644 --- a/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx +++ b/src/pages/compute/containers/Instance/actions/CreateSnapshot.jsx @@ -64,7 +64,7 @@ export const getZero = (cinderQuota) => { const allQuota = getQuota(cinderQuota) || {}; const { snapshotQuota = {} } = allQuota; const zero = [ - { ...snapshotQuota, add: 0, name: 'snapshot', title: t('Snapshot') }, + { ...snapshotQuota, add: 0, name: 'snapshot', title: t('Volume Snapshot') }, ]; Object.keys(types).forEach((type) => { const typeQuota = allQuota[type] || {}; @@ -109,7 +109,9 @@ export const getAdd = (cinderQuota) => { export class CreateSnapshot extends ModalAction { static id = 'create-snapshot'; - static title = t('Create Snapshot'); + static title = t('Create Instance Snapshot'); + + static buttonText = t('Create Snapshot'); init() { this.store = globalServerStore; @@ -261,7 +263,7 @@ export class CreateSnapshot extends ModalAction { }, { name: 'snapshot', - label: t('Snapshot Name'), + label: t('Instance Snapshot Name'), type: 'input-name', isImage: true, required: true, diff --git a/src/pages/compute/containers/InstanceSnapshot/actions/CreateVolume.jsx b/src/pages/compute/containers/InstanceSnapshot/actions/CreateVolume.jsx index 3968dc37..fddcad85 100644 --- a/src/pages/compute/containers/InstanceSnapshot/actions/CreateVolume.jsx +++ b/src/pages/compute/containers/InstanceSnapshot/actions/CreateVolume.jsx @@ -143,7 +143,7 @@ export class CreateVolume extends ModalAction { return [ { name: 'snapshot', - label: t('Snapshot'), + label: t('Volume Snapshot'), type: 'label', iconType: 'snapshot', }, diff --git a/src/pages/storage/containers/Backup/Detail/index.jsx b/src/pages/storage/containers/Backup/Detail/index.jsx index f4c3e85d..2b68c957 100644 --- a/src/pages/storage/containers/Backup/Detail/index.jsx +++ b/src/pages/storage/containers/Backup/Detail/index.jsx @@ -21,7 +21,7 @@ import actionConfigs from '../actions'; export class Detail extends Base { get name() { - return t('backup'); + return t('volume backup'); } get policy() { diff --git a/src/pages/storage/containers/Backup/actions/Create.jsx b/src/pages/storage/containers/Backup/actions/Create.jsx index 60b1c576..f32633a3 100644 --- a/src/pages/storage/containers/Backup/actions/Create.jsx +++ b/src/pages/storage/containers/Backup/actions/Create.jsx @@ -34,10 +34,10 @@ import { export class Create extends ModalAction { static id = 'create'; - static title = t('Create Backup'); + static title = t('Create Volume Backup'); get name() { - return t('Create Backup'); + return t('Create Volume Backup'); } static get modalSize() { @@ -115,7 +115,7 @@ export class Create extends ModalAction { return [ { name: 'name', - label: t('Backup Name'), + label: t('Volume Backup Name'), type: 'input-name', required: true, }, diff --git a/src/pages/storage/containers/Backup/actions/Delete.jsx b/src/pages/storage/containers/Backup/actions/Delete.jsx index efd7fbef..88aa762b 100644 --- a/src/pages/storage/containers/Backup/actions/Delete.jsx +++ b/src/pages/storage/containers/Backup/actions/Delete.jsx @@ -21,7 +21,7 @@ export default class DeleteAction extends ConfirmAction { } get title() { - return t('Delete Backup'); + return t('Delete Volume Backup'); } get isDanger() { @@ -33,7 +33,7 @@ export default class DeleteAction extends ConfirmAction { } get actionName() { - return t('delete backup'); + return t('delete volume backup'); } policy = 'backup:delete'; diff --git a/src/pages/storage/containers/Backup/actions/Edit.jsx b/src/pages/storage/containers/Backup/actions/Edit.jsx index aa541a78..3e6b0981 100644 --- a/src/pages/storage/containers/Backup/actions/Edit.jsx +++ b/src/pages/storage/containers/Backup/actions/Edit.jsx @@ -19,7 +19,7 @@ import globalBackupStore from 'stores/cinder/backup'; export class Edit extends ModalAction { static id = 'edit-backup'; - static title = t('Edit Backup'); + static title = t('Edit Volume Backup'); static buttonText = t('Edit'); diff --git a/src/pages/storage/containers/Backup/index.jsx b/src/pages/storage/containers/Backup/index.jsx index 3a6ae076..c652678d 100644 --- a/src/pages/storage/containers/Backup/index.jsx +++ b/src/pages/storage/containers/Backup/index.jsx @@ -21,7 +21,7 @@ import actionConfigs from './actions'; export class Backup extends Base { get name() { - return t('Backups'); + return t('volume backups'); } get policy() { diff --git a/src/pages/storage/containers/Snapshot/Detail/index.jsx b/src/pages/storage/containers/Snapshot/Detail/index.jsx index d0f105d1..3496838a 100644 --- a/src/pages/storage/containers/Snapshot/Detail/index.jsx +++ b/src/pages/storage/containers/Snapshot/Detail/index.jsx @@ -21,7 +21,7 @@ import actionConfigs from '../actions'; export class Detail extends Base { get name() { - return t('snapshot'); + return t('volume snapshot'); } get policy() { diff --git a/src/pages/storage/containers/Snapshot/actions/CreateVolume.jsx b/src/pages/storage/containers/Snapshot/actions/CreateVolume.jsx index 464835e2..1ef8848c 100644 --- a/src/pages/storage/containers/Snapshot/actions/CreateVolume.jsx +++ b/src/pages/storage/containers/Snapshot/actions/CreateVolume.jsx @@ -103,7 +103,7 @@ export class CreateVolume extends ModalAction { return [ { name: 'snapshot', - label: t('Snapshot'), + label: t('Volume Snapshot'), type: 'label', iconType: 'snapshot', }, diff --git a/src/pages/storage/containers/Snapshot/actions/Delete.jsx b/src/pages/storage/containers/Snapshot/actions/Delete.jsx index c449c297..182a35a3 100644 --- a/src/pages/storage/containers/Snapshot/actions/Delete.jsx +++ b/src/pages/storage/containers/Snapshot/actions/Delete.jsx @@ -22,7 +22,7 @@ export default class DeleteAction extends ConfirmAction { } get title() { - return t('Delete Snapshot'); + return t('Delete Volume Snapshot'); } get isDanger() { @@ -34,7 +34,7 @@ export default class DeleteAction extends ConfirmAction { } get actionName() { - return t('delete snapshot'); + return t('delete volume snapshot'); } policy = 'volume:delete_snapshot'; diff --git a/src/pages/storage/containers/Volume/Detail/index.jsx b/src/pages/storage/containers/Volume/Detail/index.jsx index 9736f971..7e5b6f87 100644 --- a/src/pages/storage/containers/Volume/Detail/index.jsx +++ b/src/pages/storage/containers/Volume/Detail/index.jsx @@ -94,12 +94,12 @@ export class VolumeDetail extends Base { component: BaseDetail, }, { - title: t('Backup'), + title: t('Volume Backup'), key: 'backup', component: Backup, }, { - title: t('Snapshot'), + title: t('Volume Snapshot'), key: 'snapshot', component: Snapshot, }, diff --git a/src/pages/storage/containers/Volume/actions/Create/index.jsx b/src/pages/storage/containers/Volume/actions/Create/index.jsx index 27a055c9..f3629b82 100644 --- a/src/pages/storage/containers/Volume/actions/Create/index.jsx +++ b/src/pages/storage/containers/Volume/actions/Create/index.jsx @@ -203,7 +203,7 @@ export class Create extends FormAction { return [ { label: t('Blank Volume'), value: 'blank-volume' }, { label: t('Image'), value: 'image' }, - { label: t('Snapshot'), value: 'snapshot' }, + { label: t('Volume Snapshot'), value: 'snapshot' }, // { label: t('Backup'), value: 'backup' }, ]; } @@ -438,7 +438,7 @@ export class Create extends FormAction { }, { name: 'snapshot', - label: t('Snapshot'), + label: t('Volume Snapshot'), type: 'select-table', backendPageStore: this.snapshotStore, required: this.sourceTypeIsSnapshot, diff --git a/src/pages/storage/containers/Volume/actions/CreateBackup.jsx b/src/pages/storage/containers/Volume/actions/CreateBackup.jsx index 064f5499..fe8b5493 100644 --- a/src/pages/storage/containers/Volume/actions/CreateBackup.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateBackup.jsx @@ -28,10 +28,12 @@ import { export class CreateBackup extends ModalAction { static id = 'create-backup'; - static title = t('Create Backup'); + static title = t('Create Volume Backup'); + + static buttonText = t('Create Backup'); get name() { - return t('Create backup'); + return t('Create volume backup'); } get tips() { @@ -63,7 +65,7 @@ export class CreateBackup extends ModalAction { }, { name: 'name', - label: t('Backup Name'), + label: t('Volume Backup Name'), type: 'input-name', required: true, }, diff --git a/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx b/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx index 062c853a..518837e1 100644 --- a/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx +++ b/src/pages/storage/containers/Volume/actions/CreateSnapshot.jsx @@ -38,7 +38,9 @@ const getAdd = (cinderQuota) => { export class CreateSnapshot extends ModalAction { static id = 'create-snapshot'; - static title = t('Create Snapshot'); + static title = t('Create Volume Snapshot'); + + static buttonText = t('Create Snapshot'); init() { globalSnapshotStore.setCurrentVolumeType(this.item); @@ -50,7 +52,7 @@ export class CreateSnapshot extends ModalAction { } get name() { - return t('create snapshot'); + return t('create volume snapshot'); } get defaultValue() { @@ -101,7 +103,7 @@ export class CreateSnapshot extends ModalAction { ...snapshotQuota, add, name: 'snapshot', - title: t('Snapshots'), + title: t('Volume Snapshot'), }; const { volume_type } = this.item; const typeData = { @@ -124,7 +126,7 @@ export class CreateSnapshot extends ModalAction { }, { name: 'name', - label: t('Snapshot Name'), + label: t('Volume Snapshot Name'), type: 'input-name', placeholder: t('Please input snapshot name'), required: true, diff --git a/src/pages/storage/containers/Volume/actions/Restore.jsx b/src/pages/storage/containers/Volume/actions/Restore.jsx index 0b97f91d..75779e32 100644 --- a/src/pages/storage/containers/Volume/actions/Restore.jsx +++ b/src/pages/storage/containers/Volume/actions/Restore.jsx @@ -21,7 +21,7 @@ import { getSinceTime } from 'utils/time'; export class RestoreAction extends ModalAction { static id = 'Restore from snapshot'; - static title = t('Restore from snapshot'); + static title = t('Restore From Snapshot'); init() { this.store = new VolumeStore(); @@ -55,7 +55,7 @@ export class RestoreAction extends ModalAction { }, { name: 'snapshot', - label: t('Select Snapshot'), + label: t('Select Volume Snapshot'), type: 'select-table', backendPageStore: this.snapshotStore, extraParams: { volume_id: id }, diff --git a/src/resources/cinder/backup.jsx b/src/resources/cinder/backup.jsx index 0d10d1bb..15c97c70 100644 --- a/src/resources/cinder/backup.jsx +++ b/src/resources/cinder/backup.jsx @@ -188,13 +188,13 @@ export const getQuotaInfo = (self) => { ...backups, add, name: 'backup', - title: t('Backup'), + title: t('Volume Backup'), }; const sizeData = { ...gigabytes, add: addSize, name: 'gigabytes', - title: t('Backup gigabytes (GiB)'), + title: t('Volume Backup Gigabytes (GiB)'), type: 'line', }; return [backupData, sizeData]; diff --git a/test/e2e/integration/pages/storage/backup.spec.js b/test/e2e/integration/pages/storage/backup.spec.js index 2b2ec750..3ce0bd29 100644 --- a/test/e2e/integration/pages/storage/backup.spec.js +++ b/test/e2e/integration/pages/storage/backup.spec.js @@ -71,7 +71,9 @@ onlyOn(backupServiceEnabled, () => { cy.visitPage(volumeListUrl) .tableSearchText(volumeName) .goToDetail() - .clickDetailTab('Backup', 'backup'); + .clickDetailTab('Volume Backup', 'backup') + .tableSearchText(name) + .goToDetail(); }); it('successfully restore by backup', () => { diff --git a/test/e2e/integration/pages/storage/snapshot.spec.js b/test/e2e/integration/pages/storage/snapshot.spec.js index f61c18bb..cc413aec 100644 --- a/test/e2e/integration/pages/storage/snapshot.spec.js +++ b/test/e2e/integration/pages/storage/snapshot.spec.js @@ -50,7 +50,9 @@ describe('The Volume Snapshot Page', () => { cy.visitPage(volumeListUrl) .tableSearchText(volumeName) .goToDetail() - .clickDetailTab('Snapshot', 'snapshot'); + .clickDetailTab('Volume Snapshot', 'snapshot') + .tableSearchText(name) + .goToDetail(); }); it('successfully create volume', () => { diff --git a/test/e2e/integration/pages/storage/volume.spec.js b/test/e2e/integration/pages/storage/volume.spec.js index fa09f039..903f5634 100644 --- a/test/e2e/integration/pages/storage/volume.spec.js +++ b/test/e2e/integration/pages/storage/volume.spec.js @@ -77,8 +77,8 @@ describe('The Volume Page', () => { .checkTableFirstRow(name) .goToDetail() .checkDetailName(name); - cy.clickDetailTab('Backup', 'backup').clickDetailTab( - 'Snapshot', + cy.clickDetailTab('Volume Backup', 'backup').clickDetailTab( + 'Volume Snapshot', 'snapshot' ); cy.goBackToList(listUrl); @@ -94,7 +94,7 @@ describe('The Volume Page', () => { cy.tableSearchText(name) .goToDetail() - .clickDetailTab('Snapshot') + .clickDetailTab('Volume Snapshot') .tableSearchText(snapshotName) .checkTableFirstRow(snapshotName);