Liron Ar has uploaded a new change for review.
Change subject: core: fix i18n - CDA messages
......................................................................
core: fix i18n - CDA messages
Removal of text from the message replacements to avoid breaking i18n.
Change-Id: I3a2c548c50cfab8d9a2d36730a7a8351449549d7
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
6 files changed, 19 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/22787/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
index a0ccb68..7620c8d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/DiskImagesValidator.java
@@ -110,7 +110,7 @@
if (device.getSnapshotId() != null && (!onlyPlugged ||
device.getIsPlugged())) {
VM vm = getVmDAO().get(device.getVmId());
Snapshot snapshot =
getSnapshotDAO().get(device.getSnapshotId());
- pluggedDiskSnapshotInfo.add(String.format("%s (from
Snapshot: %s VM attached to: %s) %n",
+ pluggedDiskSnapshotInfo.add(String.format("%s ,%s, %s %n",
diskImage.getDiskAlias(),
snapshot.getDescription(), vm.getName()));
}
}
@@ -118,6 +118,7 @@
if (!pluggedDiskSnapshotInfo.isEmpty()) {
pluggedDiskSnapshotInfo.addFirst(String.format("%n"));
+ pluggedDiskSnapshotInfo.add(String.format("%n"));
VdcBllMessages message =
onlyPlugged ?
VdcBllMessages.ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM
:
VdcBllMessages.ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
index 1a8a76f..52e51ec 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
@@ -126,7 +126,7 @@
pluggedDiskSnapshotAliases.add(disk.getDiskAlias());
}
vmPluggedDiskSnapshotsInfo.add(
- String.format("VM: %s, Disk(s) Snapshots: %s",
+ String.format("%s / %s",
vm.getName(),
StringUtils.join(pluggedDiskSnapshotAliases, ",")));
}
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 16c849b..3768aad 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -77,7 +77,7 @@
VDS_CANNOT_MAINTENANCE_IT_INCLUDES_NON_MIGRATABLE_VM=Cannot switch the
following Hosts to Maintenance mode: ${HostsList}.\n\
One or more running VMs are indicated as non-migratable. The non-migratable
VMs are: ${VmsList}.
VDS_CANNOT_MAINTENANCE_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot switch the
following Hosts to Maintenance mode: ${HostsList}.\n\
-The following VMs cannot be migrated because they have activated Disk Snapshot
attached: \n \n\
+The following VMs cannot be migrated because they have activated Disk Snapshot
attached (VM/Disk Snapshots): \n \n\
${disksInfo} \n \n\
please deactivate/detach the Disk snapshots or turn off those VMs and try
again.
VDS_CANNOT_REMOVE_DEFAULT_VDS_GROUP=Cannot remove default Host Cluster.
@@ -140,9 +140,9 @@
ACTION_TYPE_FAILED_MISSED_STORAGES_FOR_SOME_DISKS=Cannot ${action} ${type}.
One or more provided storage domains are in maintenance/non-operational status.
ACTION_TYPE_FAILED_STORAGE_DOMAIN_IS_WRONG=Cannot ${action} ${type}. Provided
wrong storage domain, which is not related to disk.
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
-ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are attached to other VMs:
${disksInfo} Please detach them from those VMs and try again.
-ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are plugged to other VMs:
${disksInfo} Please deactivate/detach them from those VMs and try again.
-ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot ${action} ${type}. The
following VM's activated disks are disk snapshots:\n\
+ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are attached to other VMs (Disk
Alias/Snapshot Description/VM attached to): ${disksInfo} Please detach them
from those VMs and try again.
+ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are plugged to other VMs (Disk
Alias/Snapshot Description/VM attached to): ${disksInfo} Please
deactivate/detach them from those VMs and try again.
+ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot ${action} ${type}. The
following VM's activated disks are disk snapshots (VM/Disk Snapshots):\n\
${disksInfo}. \n\
Please deactivate them and try again.
ACTION_TYPE_FAILED_SHAREABLE_DISKS_NOT_SUPPORTED_ON_GLUSTER_DOMAIN=Cannot
${action} ${type}. Shareable disks are not supported on Gluster domains.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index c9820af..642ade1 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -175,7 +175,7 @@
@DefaultStringValue("Cannot switch the following Hosts to Maintenance
mode: ${HostsList}.\nOne or more running VMs are indicated as non-migratable.
The non-migratable VMs are: ${VmsList}.")
String VDS_CANNOT_MAINTENANCE_IT_INCLUDES_NON_MIGRATABLE_VM();
- @DefaultStringValue("Cannot switch the following Hosts to Maintenance
mode: ${HostsList}.\nThe following VMs cannot be migrated because they have
activated Disk Snapshot attached: \n \n ${disksInfo} \n \nplease
deactivate/detach the Disk snapshots or turn off those VMs and try again.")
+ @DefaultStringValue("Cannot switch the following Hosts to Maintenance
mode: ${HostsList}.\nThe following VMs cannot be migrated because they have
activated Disk Snapshot attached (VM/Disk Snapshots): \n \n ${disksInfo} \n
\nplease deactivate/detach the Disk snapshots or turn off those VMs and try
again.")
String VDS_CANNOT_MAINTENANCE_VM_HAS_PLUGGED_DISK_SNAPSHOT();
@DefaultStringValue("Cannot remove default Host Cluster.")
@@ -346,13 +346,13 @@
@DefaultStringValue("Cannot ${action} ${type}. VM is previewing a
Snapshot.")
String ACTION_TYPE_FAILED_VM_IN_PREVIEW();
- @DefaultStringValue("Cannot ${action} ${type}. The following VM's disks
snapshots are attached to other VMs: ${disksInfo} Please detach them from those
VMs and try again.")
+ @DefaultStringValue("Cannot ${action} ${type}. The following VM's disks
snapshots are attached to other VMs (Disk Alias/Snapshot Description/VM
attached to): ${disksInfo} Please detach them from those VMs and try again.")
String ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM();
- @DefaultStringValue("Cannot ${action} ${type}. The following VM's disks
snapshots are plugged to other VMs: ${disksInfo} Please deactivate/detach them
from those VMs and try again.")
+ @DefaultStringValue("Cannot ${action} ${type}. The following VM's disks
snapshots are plugged to other VMs (Disk Alias/Snapshot Description/VM attached
to): ${disksInfo} Please deactivate/detach them from those VMs and try again.")
String ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM();
- @DefaultStringValue("Cannot ${action} ${type}. The following VM's
activated disks are disk snapshots: \n ${disksInfo}. \nPlease deactivate them
and try again.")
+ @DefaultStringValue("Cannot ${action} ${type}. The following VM's
activated disks are disk snapshots (VM/Disk Snapshots): \n ${disksInfo}.
\nPlease deactivate them and try again.")
String ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT();
@DefaultStringValue("Cannot ${action} ${type}. Shareable disks are not
supported on Gluster domains.")
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index a731ca6..775f926 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -77,7 +77,7 @@
VDS_CANNOT_MAINTENANCE_IT_INCLUDES_NON_MIGRATABLE_VM=Cannot switch the
following Hosts to Maintenance mode: ${HostsList}.\n\
One or more running VMs are indicated as non-migratable. The non-migratable
VMs are: ${VmsList}.
VDS_CANNOT_MAINTENANCE_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot switch the
following Hosts to Maintenance mode: ${HostsList}.\n
-The following VMs cannot be migrated because they have activated Disk Snapshot
attached: \n \n\
+The following VMs cannot be migrated because they have activated Disk Snapshot
attached (VM/Disk Snapshots): \n \n\
${disksInfo} \n \n
please deactivate/detach the Disk snapshots or turn off those VMs and try
again.
VDS_CANNOT_REMOVE_DEFAULT_VDS_GROUP=Cannot remove default Host Cluster.
@@ -133,9 +133,9 @@
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
VM_NOT_FOUND=VM not found
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
-ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are attached to other VMs:
${disksInfo} Please detach them from those VMs and try again.
-ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are plugged to other VMs:
${disksInfo} Please deactivate/detach them from those VMs and try again.
-ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot ${action} ${type}. The
following VM's activated disks are disk snapshots:\n\
+ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are attached to other VMs (Disk
Alias/Snapshot Description/VM attached to): ${disksInfo} Please detach them
from those VMs and try again.
+ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are plugged to other VMs (Disk
Alias/Snapshot Description/VM attached to): ${disksInfo} Please
deactivate/detach them from those VMs and try again.
+ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot ${action} ${type}. The
following VM's activated disks are disk snapshots (VM/Disk Snapshots):\n\
${disksInfo}. \n\
Please deactivate them and try again.
ACTION_TYPE_FAILED_SHAREABLE_DISKS_NOT_SUPPORTED_ON_GLUSTER_DOMAIN=Cannot
${action} ${type}. Shareable disks are not supported on Gluster domains.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index c58f7b7..a3014c4 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -77,7 +77,7 @@
VDS_CANNOT_MAINTENANCE_IT_INCLUDES_NON_MIGRATABLE_VM=Cannot switch the
following Hosts to Maintenance mode: ${HostsList}.\n\
One or more running VMs are indicated as non-migratable. The non-migratable
VMs are: ${VmsList}.
VDS_CANNOT_MAINTENANCE_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot switch the
following Hosts to Maintenance mode: ${HostsList}.\n\
-The following VMs cannot be migrated because they have activated Disk Snapshot
attached: \n \n\
+The following VMs cannot be migrated because they have activated Disk Snapshot
attached (VM/Disk Snapshots): \n \n\
${disksInfo} \n \n\
please deactivate/detach the Disk snapshots or turn off those VMs and try
again.
VDS_CANNOT_REMOVE_DEFAULT_VDS_GROUP=Cannot remove default Host Cluster.
@@ -137,9 +137,9 @@
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
VM_NOT_FOUND=VM not found
ACTION_TYPE_FAILED_VM_IN_PREVIEW=Cannot ${action} ${type}. VM is previewing a
Snapshot.
-ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are attached to other VMs:
${disksInfo} Please detach them from those VMs and try again.
-ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are plugged to other VMs:
${disksInfo} Please deactivate/detach them from those VMs and try again.
-ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot ${action} ${type}. The
following VM's activated disks are disk snapshots:\n\
+ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_ATTACHED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are attached to other VMs (Disk
Alias/Snapshot Description/VM attached to): ${disksInfo} Please detach them
from those VMs and try again.
+ACTION_TYPE_FAILED_VM_DISK_SNAPSHOT_IS_PLUGGED_TO_ANOTHER_VM=Cannot ${action}
${type}. The following VM's disks snapshots are plugged to other VMs (Disk
Alias/Snapshot Description/VM attached to): ${disksInfo} Please
deactivate/detach them from those VMs and try again.
+ACTION_TYPE_FAILED_VM_HAS_PLUGGED_DISK_SNAPSHOT=Cannot ${action} ${type}. The
following VM's activated disks are disk snapshots (VM/Disk Snapshots):\n\
${disksInfo}. \n\
Please deactivate them and try again.
ACTION_TYPE_FAILED_SHAREABLE_DISKS_NOT_SUPPORTED_ON_GLUSTER_DOMAIN=Cannot
${action} ${type}. Shareable disks are not supported on Gluster domains.
--
To view, visit http://gerrit.ovirt.org/22787
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a2c548c50cfab8d9a2d36730a7a8351449549d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
