Tal Nisan has uploaded a new change for review. Change subject: core: Correct error message ......................................................................
core: Correct error message The error message ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL lacked the type parameter which resulted in message like "The Action add is not supported" instead of "add Disk" for instance. Change-Id: I5517297e0de3350f3d62ab67cb908b4525e306d8 Related-To: https://bugzilla.redhat.com/1074254 Signed-off-by: Tal Nisan <[email protected]> --- 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 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/26220/1 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 1c8fb7c..477537c 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -664,7 +664,7 @@ VM_PINNING_PINNED_TO_NO_CPU=Cannot pin a vCPU to no pCPU. ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_EXPORT_DOMAIN=Cannot export VM. Template ${TemplateName} does not exist on the export domain. if you want to export VM without its Template please use TemplateMustExists=false ACTION_TYPE_FAILED_VM_NOT_FOUND_ON_EXPORT_DOMAIN=Cannot delete VM, VM not exists in export domain -ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL=The Action ${action} is not supported for this Cluster or Data Center compatibility version +ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL=The Action ${action} ${type} is not supported for this Cluster or Data Center compatibility version ACTION_TYPE_FAILED_MAX_CPU_PER_SOCKET=Cannot ${action} ${type}. Max number of cpu per socket exceeded ACTION_TYPE_FAILED_MAX_NUM_CPU=Cannot ${action} ${type}. Max number of cpu exceeded ACTION_TYPE_FAILED_MAX_NUM_SOCKETS=Cannot ${action} ${type}. Max number of sockets exceeded 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 8a8b874..f3ed599 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 @@ -1804,7 +1804,7 @@ @DefaultStringValue("Cannot delete VM, VM not exists in export domain") String ACTION_TYPE_FAILED_VM_NOT_FOUND_ON_EXPORT_DOMAIN(); - @DefaultStringValue("The Action ${action} is not supported for this Cluster or Data Center compatibility version") + @DefaultStringValue("The Action ${action} ${type} is not supported for this Cluster or Data Center compatibility version") String ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL(); @DefaultStringValue("Cannot ${action} ${type}. Max number of cpu per socket exceeded") 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 09c8374..165cd10 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 @@ -643,7 +643,7 @@ VM_PINNING_PINNED_TO_NO_CPU=Cannot pin a vCPU to no pCPU. ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_EXPORT_DOMAIN=Cannot export VM. Template ${TemplateName} does not exist on the export domain. if you want to export VM without its Template please use TemplateMustExists=false ACTION_TYPE_FAILED_VM_NOT_FOUND_ON_EXPORT_DOMAIN=Cannot delete VM, VM not exists in export domain -ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL=The Action ${action} is not supported for this Cluster or Data Center compatibility version +ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL=The Action ${action} ${type} is not supported for this Cluster or Data Center compatibility version ACTION_TYPE_FAILED_MAX_CPU_PER_SOCKET=Cannot ${action} ${type}. Max number of cpu per socket exceeded ACTION_TYPE_FAILED_MAX_NUM_CPU=Cannot ${action} ${type}. Max number of cpu exceeded ACTION_TYPE_FAILED_MAX_NUM_SOCKETS=Cannot ${action} ${type}. Max number of sockets exceeded 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 b8f66c6..2de1411 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 @@ -664,7 +664,7 @@ VM_PINNING_PINNED_TO_NO_CPU=Cannot pin a vCPU to no pCPU. ACTION_TYPE_FAILED_TEMPLATE_NOT_FOUND_ON_EXPORT_DOMAIN=Cannot export VM. Template ${TemplateName} does not exist on the export domain. if you want to export VM without its Template please use TemplateMustExists=false ACTION_TYPE_FAILED_VM_NOT_FOUND_ON_EXPORT_DOMAIN=Cannot delete VM, VM not exists in export domain -ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL=The Action ${action} is not supported for this Cluster or Data Center compatibility version +ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL=The Action ${action} ${type} is not supported for this Cluster or Data Center compatibility version ACTION_TYPE_FAILED_MAX_CPU_PER_SOCKET=Cannot ${action} ${type}. Max number of cpu per socket exceeded ACTION_TYPE_FAILED_MAX_NUM_CPU=Cannot ${action} ${type}. Max number of cpu exceeded ACTION_TYPE_FAILED_MAX_NUM_SOCKETS=Cannot ${action} ${type}. Max number of sockets exceeded -- To view, visit http://gerrit.ovirt.org/26220 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5517297e0de3350f3d62ab67cb908b4525e306d8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
