From 612152cdbbf36d3b2c40622541835b6195a6d61b Mon Sep 17 00:00:00 2001 From: "Jingwei.Zhang" Date: Mon, 8 Aug 2022 10:22:04 +0800 Subject: [PATCH] fix: update 'gigabytes' to 'capacity' in the titile 1. Update 'gigabytes' to 'capacity' in the title 2. Add the blank before '(GiB)' and '(MiB)' 3. Update related i18n Change-Id: I46de9793f9fb32a8f33915775bdfd5d486a84253 --- src/components/FormItem/NUMAInput/index.jsx | 2 +- src/components/FormItem/ZunVolume/index.jsx | 2 +- src/locales/en.json | 33 ++++++++--------- src/locales/zh.json | 35 +++++++++---------- .../Overview/components/QuotaOverview.jsx | 8 ++--- .../containers/Flavor/Detail/BaseDetail.jsx | 4 +-- .../actions/StepCreate/ParamSetting.jsx | 8 ++--- .../containers/Image/Detail/BaseDetail.jsx | 4 +-- .../containers/Image/actions/Create.jsx | 4 +-- .../compute/containers/Image/actions/Edit.jsx | 4 +-- .../Instance/actions/StepCreate/index.jsx | 6 ++-- .../Containers/Detail/BaseDetail.jsx | 4 +-- .../database/containers/Instances/index.jsx | 2 +- src/resources/cinder/backup.jsx | 2 +- src/resources/cinder/volume.jsx | 8 ++--- src/resources/manila/share.js | 2 +- src/resources/nova/flavor.js | 2 +- 17 files changed, 62 insertions(+), 68 deletions(-) diff --git a/src/components/FormItem/NUMAInput/index.jsx b/src/components/FormItem/NUMAInput/index.jsx index 3bd3e876..6e8b40fd 100644 --- a/src/components/FormItem/NUMAInput/index.jsx +++ b/src/components/FormItem/NUMAInput/index.jsx @@ -86,7 +86,7 @@ export default class index extends Component { <> {t('CPU(Core)')} - {t('RAM(MiB)')} + {t('RAM (MiB)')} ); diff --git a/src/components/FormItem/ZunVolume/index.jsx b/src/components/FormItem/ZunVolume/index.jsx index 1be5cdbe..cd686100 100644 --- a/src/components/FormItem/ZunVolume/index.jsx +++ b/src/components/FormItem/ZunVolume/index.jsx @@ -146,7 +146,7 @@ export default class ZunVolume extends React.Component { {selectSource} - {t('Size(GiB)')} + {t('Size (GiB)')} {inputSize} diff --git a/src/locales/en.json b/src/locales/en.json index 936e9973..0897d9f2 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -866,7 +866,7 @@ "Environment": "Environment", "Environment Variable": "Environment Variable", "Environment Variables": "Environment Variables", - "Ephemeral Disk(GiB)": "Ephemeral Disk(GiB)", + "Ephemeral Disk (GiB)": "Ephemeral Disk (GiB)", "Equatorial Guinea": "Equatorial Guinea", "Eritrea": "Eritrea", "Error": "Error", @@ -1002,7 +1002,6 @@ "Get {name} error.": "Get {name} error.", "Ghana": "Ghana", "Gibraltar": "Gibraltar", - "Gigabytes (GiB)": "Gigabytes (GiB)", "Given IP": "Given IP", "Glance": "Glance", "Global Setting": "Global Setting", @@ -1364,8 +1363,8 @@ "MAC Learning State": "MAC Learning State", "MAPRFS": "MAPRFS", "MEM %": "MEM %", - "MEM LIMIT(MiB)": "MEM LIMIT(MiB)", - "MEM USAGE(MiB)": "MEM USAGE(MiB)", + "MEM LIMIT (MiB)": "MEM LIMIT (MiB)", + "MEM USAGE (MiB)": "MEM USAGE (MiB)", "MTU": "MTU", "Mac Address": "Mac Address", "MacVTap": "MacVTap", @@ -1448,9 +1447,9 @@ "Migrating": "Migrating", "Migrating To": "Migrating To", "Min Memory": "Min Memory", - "Min Memory(GiB)": "Min Memory(GiB)", + "Min Memory (GiB)": "Min Memory (GiB)", "Min System Disk": "Min System Disk", - "Min System Disk(GiB)": "Min System Disk(GiB)", + "Min System Disk (GiB)": "Min System Disk (GiB)", "Min size": "Min size", "Min. Disk": "Min. Disk", "Min. RAM": "Min. RAM", @@ -1855,7 +1854,7 @@ "Quota: Insufficient { name } quota to create resources.": "Quota: Insufficient { name } quota to create resources.", "Quota: Project quotas sufficient resources can be created": "Quota: Project quotas sufficient resources can be created", "RAM": "RAM", - "RAM(MiB)": "RAM(MiB)", + "RAM (MiB)": "RAM (MiB)", "RAW - Raw disk image format": "RAW - Raw disk image format", "RESTORE COMPLETE": "RESTORE COMPLETE", "RESUME COMPLETE": "RESUME COMPLETE", @@ -1866,7 +1865,7 @@ "ROUND_ROBIN": "Round Robin", "RSVP": "RSVP", "Raid Interface": "Raid Interface", - "Ram Size(GiB)": "Ram Size(GiB)", + "Ram Size (GiB)": "Ram Size (GiB)", "Ram value is { ram }, NUMA RAM value is { totalRam }, need to be equal. ": "Ram value is { ram }, NUMA RAM value is { totalRam }, need to be equal. ", "Ramdisk ID": "Ramdisk ID", "Ramdisk Image": "Ramdisk Image", @@ -1920,7 +1919,6 @@ "Reset failed, please retry": "Reset failed, please retry", "Resize": "Resize", "Resize Cluster": "Resize Cluster", - "Resize Container": "Resize Container", "Resize Instance": "Resize Instance", "Resized": "Resized", "Resizing or Migrating": "Resizing or Migrating", @@ -1969,7 +1967,7 @@ "Rollback In Progress": "Rollback In Progress", "Romania": "Romania", "Root Disk": "Root Disk", - "Root Disk(GiB)": "Root Disk(GiB)", + "Root Disk (GiB)": "Root Disk (GiB)", "Root directory": "Root directory", "Router": "Router", "Router Advertisements Mode": "Router Advertisements Mode", @@ -2046,9 +2044,9 @@ "Set IP": "Set IP", "Seychelles": "Seychelles", "Share": "Share", + "Share Capacity (GiB)": "Share Capacity (GiB)", "Share Detail": "Share Detail", "Share File Storage": "Share File Storage", - "Share Gigabytes(GiB)": "Share Gigabytes(GiB)", "Share Group": "Share Group", "Share Group Detail": "Share Group Detail", "Share Group Type": "Share Group Type", @@ -2104,7 +2102,6 @@ "Singapore": "Singapore", "Size": "Size", "Size (GiB)": "Size (GiB)", - "Size(GiB)": "Size(GiB)", "Slovakia (Slovak Republic)": "Slovakia (Slovak Republic)", "Slovenia": "Slovenia", "Slow Query": "Slow Query", @@ -2536,10 +2533,11 @@ "Visualization Compute Optimized Type with GPU": "Visualization Compute Optimized Type with GPU", "Volume": "Volume", "Volume Backup": "Volume Backup", + "Volume Backup Capacity (GiB)": "Volume Backup Capacity (GiB)", "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 Capacity (GiB)": "Volume Capacity (GiB)", "Volume Detail": "Volume Detail", "Volume Driver": "Volume Driver", "Volume ID": "Volume ID", @@ -2725,7 +2723,6 @@ "flavor": "flavor", "floating ip": "floating ip", "floating ips": "floating ips", - "gigabytes": "gigabytes", "heat services": "heat services", "host aggregates": "host aggregates", "hosts": "hosts", @@ -2855,13 +2852,13 @@ "volume": "volume", "volume backup": "volume backup", "volume backups": "volume backups", - "volume gigabytes": "volume gigabytes", + "volume capacity": "volume capacity", "volume snapshot": "volume snapshot", "volume snapshots": "volume snapshots", "volume type": "volume type", "volume type qos": "volume type qos", "volume type {type}": "volume type {type}", - "volume type {type} gigabytes": "volume type {type} gigabytes", + "volume type {type} capacity": "volume type {type} capacity", "volume types": "volume types", "volumes": "volumes", "vpn IKE policy": "vpn IKE policy", @@ -2884,8 +2881,8 @@ "{interval, plural, =1 {one week} other {# weeks} } later delete": "{interval, plural, =1 {one week} other {# weeks} } later delete", "{minutes} minutes {leftSeconds} seconds": "{minutes} minutes {leftSeconds} seconds", "{name} type": "{name} type", - "{name} type gigabytes": "{name} type gigabytes", - "{name} type gigabytes(GiB)": "{name} type gigabytes(GiB)", + "{name} type capacity": "{name} type capacity", + "{name} type capacity (GiB)": "{name} type capacity (GiB)", "{name} type snapshots": "{name} type snapshots", "{name} {id} could not be found.": "{name} {id} could not be found.", "{number} port forwarding rules": "{number} port forwarding rules", diff --git a/src/locales/zh.json b/src/locales/zh.json index 3f439189..ec98d9aa 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -294,7 +294,7 @@ "Cancel Transfer": "取消云硬盘转让", "Cancel upload successfully.": "取消上传成功。", "Capacity & Type": "容量和类型", - "Capacity (GiB)": "容量(GiB)", + "Capacity (GiB)": "容量 (GiB)", "Cape Verde": "佛得角", "Capsule Detail": "集合详情", "Capsule Type": "集合类型", @@ -866,7 +866,7 @@ "Environment": "环境", "Environment Variable": "环境变量", "Environment Variables": "环境变量", - "Ephemeral Disk(GiB)": "本地临时卷（GiB）", + "Ephemeral Disk (GiB)": "本地临时卷 (GiB)", "Equatorial Guinea": "赤道几内亚", "Eritrea": "厄立特里亚国", "Error": "错误", @@ -1002,7 +1002,6 @@ "Get {name} error.": "获取{name}失败。", "Ghana": "加纳", "Gibraltar": "直布罗陀", - "Gigabytes (GiB)": "容量 (GiB)", "Given IP": "指定IP", "Glance": "", "Global Setting": "平台配置", @@ -1364,8 +1363,8 @@ "MAC Learning State": "MAC学习状态", "MAPRFS": "", "MEM %": "内存使用率(%)", - "MEM LIMIT(MiB)": "总内存(MiB)", - "MEM USAGE(MiB)": "已用内存(MiB)", + "MEM LIMIT (MiB)": "总内存 (MiB)", + "MEM USAGE (MiB)": "已用内存 (MiB)", "MTU": "", "Mac Address": "Mac地址", "MacVTap": "", @@ -1448,9 +1447,9 @@ "Migrating": "迁移", "Migrating To": "迁移目标", "Min Memory": "最小内存", - "Min Memory(GiB)": "最小内存(GiB)", + "Min Memory (GiB)": "最小内存 (GiB)", "Min System Disk": "最小系统盘", - "Min System Disk(GiB)": "最小系统盘(GiB)", + "Min System Disk (GiB)": "最小系统盘 (GiB)", "Min size": "最小容量", "Min. Disk": "最小硬盘大小", "Min. RAM": "最小内存", @@ -1855,7 +1854,7 @@ "Quota: Insufficient { name } quota to create resources.": "配额：{ name } 配额不足，无法创建资源。", "Quota: Project quotas sufficient resources can be created": "配额：项目配额充足，可创建资源", "RAM": "内存", - "RAM(MiB)": "内存（MiB）", + "RAM (MiB)": "内存 (MiB)", "RAW - Raw disk image format": "RAW - 原始磁盘映像格式", "RESTORE COMPLETE": "恢复完成", "RESUME COMPLETE": "恢复完成", @@ -1866,7 +1865,7 @@ "ROUND_ROBIN": "轮询算法", "RSVP": "", "Raid Interface": "Raid接口", - "Ram Size(GiB)": "内存容量（GiB）", + "Ram Size (GiB)": "内存容量 (GiB)", "Ram value is { ram }, NUMA RAM value is { totalRam }, need to be equal. ": "内存是 { ram }MiB，NUMA节点的内存是{ totalRam }MiB，需要一致。", "Ramdisk ID": "内存盘ID", "Ramdisk Image": "Ramdisk镜像", @@ -1920,7 +1919,6 @@ "Reset failed, please retry": "重置失败，请重试", "Resize": "修改配置", "Resize Cluster": "调整集群大小", - "Resize Container": "修改容器配置", "Resize Instance": "修改配置", "Resized": "已修改配置", "Resizing or Migrating": "正在修改配置/迁移", @@ -1969,7 +1967,7 @@ "Rollback In Progress": "回滚中", "Romania": "罗马尼亚", "Root Disk": "系统盘", - "Root Disk(GiB)": "根磁盘 (GiB)", + "Root Disk (GiB)": "根磁盘 (GiB)", "Root directory": "根目录", "Router": "路由器", "Router Advertisements Mode": "路由广播模式", @@ -2046,9 +2044,9 @@ "Set IP": "设置IP", "Seychelles": "塞舌尔", "Share": "共享", + "Share Capacity (GiB)": "共享容量 (GiB)", "Share Detail": "共享详情", "Share File Storage": "文件存储", - "Share Gigabytes(GiB)": "共享容量(GiB)", "Share Group": "共享组", "Share Group Detail": "共享组详情", "Share Group Type": "共享组类型", @@ -2104,7 +2102,6 @@ "Singapore": "新加坡", "Size": "容量", "Size (GiB)": "容量 (GiB)", - "Size(GiB)": "大小(GiB)", "Slovakia (Slovak Republic)": "斯洛伐克", "Slovenia": "斯洛文尼亚", "Slow Query": "", @@ -2536,10 +2533,11 @@ "Visualization Compute Optimized Type with GPU": "GPU虚拟化型", "Volume": "云硬盘", "Volume Backup": "云硬盘备份", + "Volume Backup Capacity (GiB)": "云硬盘备份容量 (GiB)", "Volume Backup Detail": "云硬盘备份详情", - "Volume Backup Gigabytes (GiB)": "云硬盘备份容量 (GiB)", "Volume Backup Name": "云硬盘备份名称", "Volume Backups": "云硬盘备份", + "Volume Capacity (GiB)": "云硬盘容量 (GiB)", "Volume Detail": "云硬盘详情", "Volume Driver": "云硬盘驱动", "Volume ID": "云硬盘ID", @@ -2725,7 +2723,6 @@ "flavor": "云主机类型", "floating ip": "浮动IP", "floating ips": "浮动IP", - "gigabytes": "容量", "heat services": "编排服务", "host aggregates": "主机集合", "hosts": "主机", @@ -2855,13 +2852,13 @@ "volume": "云硬盘", "volume backup": "云硬盘备份", "volume backups": "云硬盘备份", - "volume gigabytes": "云硬盘容量", + "volume capacity": "云硬盘容量", "volume snapshot": "云硬盘快照", "volume snapshots": "云硬盘快照", "volume type": "云硬盘类型", "volume type qos": "云硬盘类型Qos", "volume type {type}": "云硬盘类型 {type} ", - "volume type {type} gigabytes": "云硬盘类型 {type} 容量 ", + "volume type {type} capacity": "云硬盘类型 {type} 容量", "volume types": "云硬盘类型", "volumes": "云硬盘", "vpn IKE policy": "VPN IKE策略", @@ -2884,8 +2881,8 @@ "{interval, plural, =1 {one week} other {# weeks} } later delete": "{interval}周后删除", "{minutes} minutes {leftSeconds} seconds": "{minutes}分{leftSeconds}秒", "{name} type": "{name} 类型", - "{name} type gigabytes": "{name} 类型容量", - "{name} type gigabytes(GiB)": "{name} 类型容量(GiB)", + "{name} type capacity": "{name} 类型容量", + "{name} type capacity (GiB)": "{name} 类型容量 (GiB)", "{name} type snapshots": "{name} 类型快照", "{name} {id} could not be found.": "您查看的资源{name} {id} 无法获取", "{number} port forwarding rules": "{number}个端口转发规则", diff --git a/src/pages/base/containers/Overview/components/QuotaOverview.jsx b/src/pages/base/containers/Overview/components/QuotaOverview.jsx index 35355aeb..fa6a256c 100644 --- a/src/pages/base/containers/Overview/components/QuotaOverview.jsx +++ b/src/pages/base/containers/Overview/components/QuotaOverview.jsx @@ -58,7 +58,7 @@ export const quotaCardList = [ key: 'volumes', }, { - text: t('Gigabytes (GiB)'), + text: t('Volume Capacity (GiB)'), key: 'gigabytes', }, { @@ -70,7 +70,7 @@ export const quotaCardList = [ key: 'backups', }, { - text: t('Volume Backup Gigabytes (GiB)'), + text: t('Volume Backup Capacity (GiB)'), key: 'backup_gigabytes', }, ], @@ -96,7 +96,7 @@ export const shareQuotaCard = { value: [ { text: t('Shares'), key: 'shares' }, { - text: t('Share Gigabytes(GiB)'), + text: t('Share Capacity (GiB)'), key: 'share_gigabytes', }, { text: t('Share Networks'), key: 'share_networks' }, @@ -128,7 +128,7 @@ export const getVolumeTypeCards = (data) => { key: `volumes_${item.name}`, }, { - text: t('{name} type gigabytes(GiB)', { name: item.name }), + text: t('{name} type capacity (GiB)', { name: item.name }), key: `gigabytes_${item.name}`, }, { diff --git a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx index 85630c85..ae58f0db 100644 --- a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx +++ b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx @@ -116,7 +116,7 @@ export class BaseDetail extends Base { ]; if (hasEphemeral) { options.push({ - label: t('Ephemeral Disk(GiB)'), + label: t('Ephemeral Disk (GiB)'), dataIndex: 'OS-FLV-EXT-DATA:ephemeral', }); } @@ -154,7 +154,7 @@ export class BaseDetail extends Base { get diskCard() { const options = [ { - label: t('Root Disk(GiB)'), + label: t('Root Disk (GiB)'), dataIndex: 'disk', }, ]; diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx index 62a2c55a..59cd0746 100644 --- a/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx +++ b/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx @@ -360,7 +360,7 @@ export class ParamSetting extends Base { }, { name: 'memoryGb', - label: t('Ram Size(GiB)'), + label: t('Ram Size (GiB)'), type: 'input-int', min: 1, required: true, @@ -374,14 +374,14 @@ export class ParamSetting extends Base { }, { name: 'ephemeral', - label: t('Ephemeral Disk(GiB)'), + label: t('Ephemeral Disk (GiB)'), type: 'input-int', min: 0, hidden: !hasEphemeral, }, { name: 'ephemeralTmp', - label: t('Ephemeral Disk(GiB)'), + label: t('Ephemeral Disk (GiB)'), type: 'input-int', min: 0, hidden: isBareMetal || hasEphemeral, @@ -389,7 +389,7 @@ export class ParamSetting extends Base { }, { name: 'disk', - label: t('Root Disk(GiB)'), + label: t('Root Disk (GiB)'), type: 'input-int', min: 0, hidden: this.enableCinder, diff --git a/src/pages/compute/containers/Image/Detail/BaseDetail.jsx b/src/pages/compute/containers/Image/Detail/BaseDetail.jsx index fc6062e4..7c2a7336 100644 --- a/src/pages/compute/containers/Image/Detail/BaseDetail.jsx +++ b/src/pages/compute/containers/Image/Detail/BaseDetail.jsx @@ -44,11 +44,11 @@ export class BaseDetail extends Base { valueRender: 'bytes', }, { - label: t('Min System Disk(GiB)'), + label: t('Min System Disk (GiB)'), dataIndex: 'min_disk', }, { - label: t('Min Memory(GiB)'), + label: t('Min Memory (GiB)'), dataIndex: 'min_ram', valueRender: 'GiBValue', }, diff --git a/src/pages/compute/containers/Image/actions/Create.jsx b/src/pages/compute/containers/Image/actions/Create.jsx index 2ce0bb24..0d211b34 100644 --- a/src/pages/compute/containers/Image/actions/Create.jsx +++ b/src/pages/compute/containers/Image/actions/Create.jsx @@ -251,14 +251,14 @@ export class CreateForm extends FormAction { }, { name: 'min_disk', - label: t('Min System Disk(GiB)'), + label: t('Min System Disk (GiB)'), type: 'input-int', min: 0, max: 500, }, { name: 'min_ram', - label: t('Min Memory(GiB)'), + label: t('Min Memory (GiB)'), type: 'input-int', min: 0, max: 500, diff --git a/src/pages/compute/containers/Image/actions/Edit.jsx b/src/pages/compute/containers/Image/actions/Edit.jsx index be2a01de..b41a37d0 100644 --- a/src/pages/compute/containers/Image/actions/Edit.jsx +++ b/src/pages/compute/containers/Image/actions/Edit.jsx @@ -125,7 +125,7 @@ export class Edit extends ModalAction { }, { name: 'min_disk', - label: t('Min System Disk(GiB)'), + label: t('Min System Disk (GiB)'), type: 'input-int', min: 0, max: 500, @@ -133,7 +133,7 @@ export class Edit extends ModalAction { }, { name: 'min_ram', - label: t('Min Memory(GiB)'), + label: t('Min Memory (GiB)'), type: 'input-int', min: 0, max: 500, diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx index de75aaaa..18ae1fd9 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/index.jsx @@ -217,7 +217,7 @@ export class StepCreate extends StepAction { ...volumeQuota.gigabytes, add: quotaError ? 0 : totalNewSize, name: 'volumeSize', - title: t('Volume Size'), + title: t('Volume Capacity (GiB)'), type: 'line', }; const serverGroupQuota = this.getServerGroupQuota(); @@ -363,7 +363,7 @@ export class StepCreate extends StepAction { const totalSizeMsg = this.getQuotaMessage( totalNewSize, quotaAll.gigabytes, - t('volume gigabytes') + t('volume capacity') ); if (totalSizeMsg) { return totalSizeMsg; @@ -385,7 +385,7 @@ export class StepCreate extends StepAction { const sizeMsg = this.getQuotaMessage( newSizeMap[key], quotaAll[`gigabytes_${key}`], - t('volume type {type} gigabytes', { type: key }) + t('volume type {type} capacity', { type: key }) ); if (sizeMsg) { msg = sizeMsg; diff --git a/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx b/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx index 49adcd88..e71f85ef 100644 --- a/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx +++ b/src/pages/container-service/containers/Containers/Detail/BaseDetail.jsx @@ -191,11 +191,11 @@ export class BaseDetail extends Base { render: (value = 0) => value.toFixed(4), }, { - label: t('MEM LIMIT(MiB)'), + label: t('MEM LIMIT (MiB)'), dataIndex: 'stats[MEM LIMIT(MiB)]', }, { - label: t('MEM USAGE(MiB)'), + label: t('MEM USAGE (MiB)'), dataIndex: 'stats[MEM USAGE(MiB)]', render: (value = 0) => value.toFixed(4), }, diff --git a/src/pages/database/containers/Instances/index.jsx b/src/pages/database/containers/Instances/index.jsx index 12d573ed..15842a6e 100644 --- a/src/pages/database/containers/Instances/index.jsx +++ b/src/pages/database/containers/Instances/index.jsx @@ -101,7 +101,7 @@ export class Instances extends Base { isHideable: true, }, { - title: t('Volume Size'), + title: t('Volume Capacity (GiB)'), dataIndex: 'size', isHideable: true, render: (value) => (value ? `${value}GiB` : '-'), diff --git a/src/resources/cinder/backup.jsx b/src/resources/cinder/backup.jsx index 9075114b..1405bc75 100644 --- a/src/resources/cinder/backup.jsx +++ b/src/resources/cinder/backup.jsx @@ -196,7 +196,7 @@ export const getQuotaInfo = (self) => { ...gigabytes, add: addSize, name: 'gigabytes', - title: t('Volume Backup Gigabytes (GiB)'), + title: t('Volume Backup Capacity (GiB)'), type: 'line', }; return [backupData, sizeData]; diff --git a/src/resources/cinder/volume.jsx b/src/resources/cinder/volume.jsx index 03edcc18..e17ab377 100644 --- a/src/resources/cinder/volume.jsx +++ b/src/resources/cinder/volume.jsx @@ -451,7 +451,7 @@ export const getAdd = (cinderQuota, withCountCheck = true) => { } if ((sizeLimit !== -1 && sizeLeft < totalSize) || sizeLeft === 0) { const error = getErrorMessage({ - name: t('gigabytes'), + name: t('volume capacity'), left: sizeLeft, input: totalSize, }); @@ -473,7 +473,7 @@ export const getAdd = (cinderQuota, withCountCheck = true) => { typeSizeLeft === 0 ) { const error = getErrorMessage({ - name: t('{name} type gigabytes', { name: type }), + name: t('{name} type capacity', { name: type }), left: typeSizeLeft, input: totalSize, }); @@ -505,7 +505,7 @@ export const getQuotaInfo = (self, withCountCheck = true) => { ...gigabytes, add: addSize, name: 'gigabytes', - title: t('Gigabytes (GiB)'), + title: t('Volume Capacity (GiB)'), type: 'line', }; if (!name) { @@ -522,7 +522,7 @@ export const getQuotaInfo = (self, withCountCheck = true) => { ...typeSizeQuota, add: addSize, name: 'typeSize', - title: t('{name} type gigabytes', { name }), + title: t('{name} type capacity', { name }), type: 'line', }; return [volumeData, sizeData, typeData, typeSizeData]; diff --git a/src/resources/manila/share.js b/src/resources/manila/share.js index 8cba1ff1..8aef57b3 100644 --- a/src/resources/manila/share.js +++ b/src/resources/manila/share.js @@ -132,7 +132,7 @@ export const getAdd = ( const titleMap = { shares: t('Share'), - gigabytes: t('Share Gigabytes(GiB)'), + gigabytes: t('Share Capacity (GiB)'), share_networks: t('Share Network'), share_groups: t('Share Group'), }; diff --git a/src/resources/nova/flavor.js b/src/resources/nova/flavor.js index 2420dc53..a3f5c7f8 100644 --- a/src/resources/nova/flavor.js +++ b/src/resources/nova/flavor.js @@ -172,7 +172,7 @@ export const getBaseColumns = (self) => [ }, }, { - title: t('Ephemeral Disk(GiB)'), + title: t('Ephemeral Disk (GiB)'), dataIndex: 'OS-FLV-EXT-DATA:ephemeral', isHideable: true, },