Skip to content

Commit 0e2369d

Browse files
authored
Merge pull request #587 from jschoiRR/mold-main#2025
[Mold UI]이벤트 목록 유형 항목명 한글화 일괄 정리 & vm xml manufacturer, product 기본값 세팅(ablecloud, ablestack cell hypervisor)
2 parents 2f93f82 + 032fa8b commit 0e2369d

File tree

3 files changed

+209
-197
lines changed

3 files changed

+209
-197
lines changed

engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ public interface VirtualMachineManager extends Manager {
8888
"If provided, a custom cloud-name in cloud-init metadata", true, ConfigKey.Scope.Zone);
8989

9090
ConfigKey<String> VmMetadataManufacturer = new ConfigKey<>("Advanced", String.class,
91-
"vm.metadata.manufacturer", "Apache Software Foundation",
91+
"vm.metadata.manufacturer", "ABLECLOUD CO.LTD",
9292
"If provided, a custom manufacturer will be used in the instance metadata. When an empty" +
93-
"value is set then default manufacturer will be 'Apache Software Foundation'. " +
94-
"A custom manufacturer may break cloud-init functionality with CloudStack datasource. Please " +
93+
"value is set then default manufacturer will be 'ABLECLOUD CO.LTD'. " +
94+
"A custom manufacturer may break cloud-init functionality with ABLECLOUD datasource. Please " +
9595
"refer documentation", true, ConfigKey.Scope.Zone);
9696
ConfigKey<String> VmMetadataProductName = new ConfigKey<>("Advanced", String.class,
97-
"vm.metadata.product", "",
97+
"vm.metadata.product", "ABLESTACK CELL Hypervisor",
9898
"If provided, a custom product name will be used in the instance metadata. When an empty" +
9999
"value is set then default product name will be 'CloudStack <HYPERVISOR_NAME> Hypervisor'. " +
100-
"A custom product name may break cloud-init functionality with CloudStack datasource. Please " +
100+
"A custom product name may break cloud-init functionality with ABLECLOUD datasource. Please " +
101101
"refer documentation",
102102
true, ConfigKey.Scope.Zone);
103103

ui/public/locales/en.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3883,7 +3883,7 @@
38833883
"state.stopped": "Stopped",
38843884
"state.stopping": "Stopping",
38853885
"state.suspended": "Suspended",
3886-
"user.login": "Login",
3886+
"user.login": "LOGIN",
38873887
"user.logout": "Logout",
38883888
"ALLOCATED_VM": "Allocated VM",
38893889
"BACKUP": "Backup",
@@ -4575,6 +4575,12 @@
45754575
"alert.vm.snapshot":"VM.SNAPSHOT",
45764576
"alert.vr.public.iface.mtu":"VR.PUBLIC.IFACE.MTU",
45774577
"alert.vr.private.iface.mtu":"VR.PRIVATE.IFACE.MTU",
4578+
"kubernetes.cluster.create": "KUBERNETES.CLUSTER.CREATE",
4579+
"kubernetes.cluster.delete": "KUBERNETES.CLUSTER.DELETE",
4580+
"kubernetes.cluster.start": "KUBERNETES.CLUSTER.START",
4581+
"kubernetes.cluster.stop": "KUBERNETES.CLUSTER.STOP",
4582+
"kubernetes.cluster.scale": "KUBERNETES.CLUSTER.SCALE",
4583+
"kubernetes.cluster.upgrade": "KUBERNETES.CLUSTER.UPGRADE",
45784584
"alert.login":"LOGIN",
45794585
"label.kvdoenable": "Compress/Dedup",
45804586
"label.action.update.compress.dedup": "Update Compress/Dedup",

0 commit comments

Comments
 (0)