From 3f23280df53142d83eda4ac9098d4420824deac4 Mon Sep 17 00:00:00 2001 From: "Jingwei.Zhang" Date: Thu, 17 Aug 2023 17:27:03 +0800 Subject: [PATCH] fix: update delete tip for instance soft delete update delete tip for soft delete instance Change-Id: Id7492e49668fcd4c6408363ad636e45ba8a67ae8 --- src/locales/en.json | 4 ++-- src/locales/ko-kr.json | 6 +++--- src/locales/zh-hans.json | 4 ++-- .../containers/Flavor/actions/StepCreate/ParamSetting.jsx | 2 +- .../compute/containers/Instance/actions/SoftDelete.jsx | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 56370d57..303a7bc7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1187,7 +1187,7 @@ "If you are not sure which authentication method to use, please contact your administrator.": "If you are not sure which authentication method to use, please contact your administrator.", "If you choose a port which subnet is different from the subnet of LB, please ensure connectivity between the two.": "If you choose a port which subnet is different from the subnet of LB, please ensure connectivity between the two.", "If you do not fill in parameters such as cpus, memory_mb, local_gb, cpu_arch, etc., you can automatically inject the configuration and Mac address of the physical machine by performing the \"Auto Inspect\" operation.": "If you do not fill in parameters such as cpus, memory_mb, local_gb, cpu_arch, etc., you can automatically inject the configuration and Mac address of the physical machine by performing the \"Auto Inspect\" operation.", - "If you still want to keep the disk data, it is recommended that you create a snapshot for the disk before deleting.": "If you still want to keep the disk data, it is recommended that you create a snapshot for the disk before deleting.", + "If you still want to keep the disk data, it is recommended that you create a backup for the disk before deleting.": "If you still want to keep the disk data, it is recommended that you create a backup for the disk before deleting.", "Illegal JSON scheme": "Illegal JSON scheme", "Image": "Image", "Image & OS": "Image & OS", @@ -1333,7 +1333,7 @@ "It is recommended that { instanceType } instance simultaneously set NUMA affinity policy for PCIE device to force or priority matching. This configuration can further improve PCIE computing performance.": "It is recommended that { instanceType } instance simultaneously set NUMA affinity policy for PCIE device to force or priority matching. This configuration can further improve PCIE computing performance.", "It is recommended to install and use this agent. The instance created with this image can be used to modify the password (qemu_guest_agent needs to be installed when creating the image).": "It is recommended to install and use this agent. The instance created with this image can be used to modify the password (qemu_guest_agent needs to be installed when creating the image).", "It is recommended to set CPU binding strategy as binding on { instanceType } instance. This configuration further improves the performance of the instance CPU.": "It is recommended to set CPU binding strategy as binding on { instanceType } instance. This configuration further improves the performance of the instance CPU.", - "It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.": "It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.", + "It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.": "It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.", "It is suggested to use the marked AZ directly, too much AZ will lead to the fragmentation of available resources": "It is suggested to use the marked AZ directly, too much AZ will lead to the fragmentation of available resources", "It is unreachable for all floating ips.": "It is unreachable for all floating ips.", "It is unreachable for this floating ip.": "It is unreachable for this floating ip.", diff --git a/src/locales/ko-kr.json b/src/locales/ko-kr.json index cf3beb7c..f3163298 100644 --- a/src/locales/ko-kr.json +++ b/src/locales/ko-kr.json @@ -95,6 +95,7 @@ "Advanced Options": "고급 옵션", "Advanced Params": "고급 매개변수", "Affiliated Domain": "제휴 도메인", + "Affiliated Domain ID/Name": "제휴 도메인 ID/이름", "Affinity": "어피니티", "Affinity (mandatory):": "어피니티 (필수)", "Affinity (not mandatory):": "어피니티 (필수 아님)", @@ -727,7 +728,7 @@ "Delete Volume Snapshot": "Volume Snapshot 삭제", "Delete Volume Type": "Volume Type 삭제", "Delete Zone": "Zone 삭제", - "Delete Metadata": "Metadata 삭제", + "Delete metadata": "Metadata 삭제", "Deleted": "삭제됨", "Deleted At": "", "Deleted with the instance": "Instance와 함께 삭제됨.", @@ -1186,7 +1187,7 @@ "If you are not sure which authentication method to use, please contact your administrator.": "사용할 인증 방법을 잘 모르는 경우 관리자에게 문의하십시오.", "If you choose a port which subnet is different from the subnet of LB, please ensure connectivity between the two.": "LB의 Subnet과 다른 Subnet의 포트를 선택할 경우, 두 서브넷 간의 연결 여부를 확인하세요.", "If you do not fill in parameters such as cpus, memory_mb, local_gb, cpu_arch, etc., you can automatically inject the configuration and Mac address of the physical machine by performing the \"Auto Inspect\" operation.": "CPU, memory, local_gb, cpu_arch 등의 매개 변수를 입력하지 않으면 \"자동 검사\" 작업을 수행하여 물리적 시스템의 구성 및 MAC 주소를 자동으로 넣을 수 있습니다.", - "If you still want to keep the disk data, it is recommended that you create a snapshot for the disk before deleting.": "디스크의 데이터를 보존하려면 삭제하기 전에 디스크의 스냅샷을 생성하는 것을 권장합니다.", + "If you still want to keep the disk data, it is recommended that you create a backup for the disk before deleting.": "디스크의 데이터를 보존하려면 디스크를 제거하기 전에 디스크를 백업하는 것이 좋습니다.", "Illegal JSON scheme": "", "Image": "", "Image & OS": "", @@ -2590,7 +2591,6 @@ "Update User Password": "사용자 암호 업데이트", "Update Zone": "업데이트 존", "Update user password": "사용자 암호 업데이트", - "Updated": "업데이트 완료", "Updated At": "갱신 시점", "Updating": "업데이트 중", "Updating Password": "비밀번호 업데이트 중", diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json index 696faa12..7f1f233e 100644 --- a/src/locales/zh-hans.json +++ b/src/locales/zh-hans.json @@ -1187,7 +1187,7 @@ "If you are not sure which authentication method to use, please contact your administrator.": "如果您不确定使用哪种认证方式，请联系管理员。", "If you choose a port which subnet is different from the subnet of LB, please ensure connectivity between the two.": "如果你选择了和LB子网不同的网卡，请确保两者的连通性。", "If you do not fill in parameters such as cpus, memory_mb, local_gb, cpu_arch, etc., you can automatically inject the configuration and Mac address of the physical machine by performing the \"Auto Inspect\" operation.": "如不填写cpus、memory_mb、local_gb、cpu_arch等参数，您可以通过执行“自动检测”操作来自动注入物理机的配置和 Mac 地址。", - "If you still want to keep the disk data, it is recommended that you create a snapshot for the disk before deleting.": "如果您仍想保留云硬盘数据，建议您在删除之前为云硬盘创建快照。", + "If you still want to keep the disk data, it is recommended that you create a backup for the disk before deleting.": "如果您仍想保留云硬盘数据，建议您在删除之前为云硬盘创建备份。", "Illegal JSON scheme": "不合法的JSON格式", "Image": "镜像", "Image & OS": "镜像和操作系统", @@ -1333,7 +1333,7 @@ "It is recommended that { instanceType } instance simultaneously set NUMA affinity policy for PCIE device to force or priority matching. This configuration can further improve PCIE computing performance.": "推荐{ instanceType }云主机同时设置PCIE设备NUMA亲和策略为强制或优先匹配。此配置可进一步提升GPU计算性能。", "It is recommended to install and use this agent. The instance created with this image can be used to modify the password (qemu_guest_agent needs to be installed when creating the image).": "推荐安装并使用此agent，使用此镜像创建的云主机才能实现修改密码（需要在制作镜像时安装qemu_guest_agent）。", "It is recommended to set CPU binding strategy as binding on { instanceType } instance. This configuration further improves the performance of the instance CPU.": "推荐{ instanceType }云主机同时设置CPU策略为专用。此配置可进一步提升云主机CPU性能。", - "It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.": "推荐{ instanceType }云主机同时设置CPU线程策略为多线程，此配置可进一步提升云主机CPU性能。", + "It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.": "推荐{ instanceType }云主机同时设置CPU线程策略为多线程，此配置可进一步提升云主机CPU性能。", "It is suggested to use the marked AZ directly, too much AZ will lead to the fragmentation of available resources": "建议直接使用已划好的 AZ，过多的 AZ 会导致可用资源碎片化。", "It is unreachable for all floating ips.": "对所有浮动IP来说这是不可达的。", "It is unreachable for this floating ip.": "对于此浮动IP而言，这是不可达的。", diff --git a/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx b/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx index e86011df..702b662a 100644 --- a/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx +++ b/src/pages/compute/containers/Flavor/actions/StepCreate/ParamSetting.jsx @@ -299,7 +299,7 @@ export class ParamSetting extends Base { { instanceType } ); const cpuThreadBindTip = t( - 'It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.', + 'It is recommended to set the CPU thread binding policy as thread binding in { instanceType } instance, which can further improve the CPU performance of instance.', { instanceType } ); const largePageTip = t( diff --git a/src/pages/compute/containers/Instance/actions/SoftDelete.jsx b/src/pages/compute/containers/Instance/actions/SoftDelete.jsx index a973991f..29de2beb 100644 --- a/src/pages/compute/containers/Instance/actions/SoftDelete.jsx +++ b/src/pages/compute/containers/Instance/actions/SoftDelete.jsx @@ -122,9 +122,9 @@ export default class SoftDelete extends ConfirmAction { ); } - get snapshotTip() { + get backupTip() { return t( - 'If you still want to keep the disk data, it is recommended that you create a snapshot for the disk before deleting.' + 'If you still want to keep the disk data, it is recommended that you create a backup for the disk before deleting.' ); } @@ -140,7 +140,7 @@ export default class SoftDelete extends ConfirmAction { 'The associated floating IP, virtual adapter, volume and other resources will be automatically disassociated.' )}

-

{this.snapshotTip}

+

{this.backupTip}

); return (