Allon Mureinik has uploaded a new change for review. Change subject: core: Fix typo in Network cluster messages ......................................................................
core: Fix typo in Network cluster messages Fixed grammar mistake "more then" to "more than". Change-Id: I9791b66a9b57e519f42aa80ff76c98f5ddb76515 Bug-Url: https://bugzilla.redhat.com/1220401 Signed-off-by: Allon Mureinik <amure...@redhat.com> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/job/ExecutionMessageDirector.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/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/55/40855/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/job/ExecutionMessageDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/job/ExecutionMessageDirector.java index e61334e..60a796c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/job/ExecutionMessageDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/job/ExecutionMessageDirector.java @@ -119,7 +119,7 @@ if (!messagesMap.containsKey(key)) { messagesMap.put(enumKey, value); } else { - log.warn("Code '{}' appears more then once in '{}' table.", key, enumClass.getSimpleName()); + log.warn("Code '{}' appears more than once in '{}' table.", key, enumClass.getSimpleName()); } } 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 54079f6..96af028 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -639,7 +639,7 @@ ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_CANNOT_BE_CHANGED=Cannot ${action} ${type}. Changing management network in a non-empty cluster is not allowed. ACTION_TYPE_FAILED_TARGET_CLUSTER_WITH_DIFF_MANAGEMENT_NETWORK=Cannot ${action} ${type}. Moving a host to cluster with different management network is not allowed. ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_CANNOT_BE_EXTERNAL=Cannot ${action} ${type}. Management network has to be not external one. -ACTION_TYPE_FAILED_DUPLICATE_NETWORK_CLUSTER_INPUT=Cannot ${action} ${type}. Network cluster ${NetworkCluster} appears more then once. +ACTION_TYPE_FAILED_DUPLICATE_NETWORK_CLUSTER_INPUT=Cannot ${action} ${type}. Network cluster ${NetworkCluster} appears more than once. ACTION_TYPE_FAILED_MIGRATION_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Migration network is not supported for this cluster version. ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST=Cannot ${action} ${type}. The provider does not exist in the system. ACTION_TYPE_FAILED_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'OpenStack Networking'. 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 9caa275..a98e1dc 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 @@ -1765,7 +1765,7 @@ @DefaultStringValue("Cannot ${action} ${type}. Management network has to be not external one.") String ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_CANNOT_BE_EXTERNAL(); - @DefaultStringValue("Cannot ${action} ${type}. Network cluster ${NetworkCluster} appears more then once.") + @DefaultStringValue("Cannot ${action} ${type}. Network cluster ${NetworkCluster} appears more than once.") String ACTION_TYPE_FAILED_DUPLICATE_NETWORK_CLUSTER_INPUT(); @DefaultStringValue("Cannot ${action} ${type}. Migration network is not supported for this cluster version.") 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 62ca70b..1dff35b 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 @@ -646,7 +646,7 @@ ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_CANNOT_BE_CHANGED=Cannot ${action} ${type}. Changing management network in a non-empty cluster is not allowed. ACTION_TYPE_FAILED_TARGET_CLUSTER_WITH_DIFF_MANAGEMENT_NETWORK=Cannot ${action} ${type}. Moving a host to cluster with different management network is not allowed. ACTION_TYPE_FAILED_MANAGEMENT_NETWORK_CANNOT_BE_EXTERNAL=Cannot ${action} ${type}. Management network has to be not external one. -ACTION_TYPE_FAILED_DUPLICATE_NETWORK_CLUSTER_INPUT=Cannot ${action} ${type}. Network cluster ${NetworkCluster} appears more then once. +ACTION_TYPE_FAILED_DUPLICATE_NETWORK_CLUSTER_INPUT=Cannot ${action} ${type}. Network cluster ${NetworkCluster} appears more than once. ACTION_TYPE_FAILED_MIGRATION_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Migration network is not supported for this cluster version. ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST=Cannot ${action} ${type}. The provider does not exist in the system. ACTION_TYPE_FAILED_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'OpenStack Networking'. -- To view, visit https://gerrit.ovirt.org/40855 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9791b66a9b57e519f42aa80ff76c98f5ddb76515 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amure...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
