Kanagaraj M has uploaded a new change for review. Change subject: webadmin: Adding translation for import cluster errors ......................................................................
webadmin: Adding translation for import cluster errors If there are any error while fetching the gluster servers to import, the error message from the server will be translated and shown to the user. Change-Id: I0a42f4d46dea10485ea1864deeddf66483fd8241 Bug-Url: https://bugzilla.redhat.com/884292 Signed-off-by: Kanagaraj M <kmayi...@redhat.com> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java 3 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/10409/1 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 a238f12..ce92f63 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 @@ -2135,4 +2135,7 @@ @DefaultStringValue("This action is not allowed when Engine is preparing for maintenance.") String ENGINE_IS_RUNNING_IN_PREPARE_MODE(); + + @DefaultStringValue("One or more servers are already part of an existing cluster") + String SERVER_ALREADY_EXISTS_IN_ANOTHER_CLUSTER(); } diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java index 8bb1e64..1839517 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/Frontend.java @@ -83,6 +83,10 @@ Frontend.loginHandler = loginHandler; } + public static ErrorTranslator getAppErrorsTranslator() { + return canDoActionErrorsTranslator; + } + private static void translateErrors(List<VdcReturnValueBase> errors) { for (VdcReturnValueBase retVal : errors) { retVal.setCanDoActionMessages(canDoActionErrorsTranslator.translateErrorText(retVal.getCanDoActionMessages())); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index f1e919f..f0fb4da 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -565,8 +565,8 @@ cluster.setcpu_name(((ServerCpu) model.getCPU().getSelectedItem()).getCpuName()); } cluster.setmax_vds_memory_over_commit(model.getMemoryOverCommit()); - cluster.setCountThreadsAsCores(Boolean.TRUE.equals((Boolean) model.getVersionSupportsCpuThreads().getEntity()) - && Boolean.TRUE.equals((Boolean) model.getCountThreadsAsCores().getEntity())); + cluster.setCountThreadsAsCores(Boolean.TRUE.equals(model.getVersionSupportsCpuThreads().getEntity()) + && Boolean.TRUE.equals(model.getCountThreadsAsCores().getEntity())); cluster.setTransparentHugepages(version.compareTo(new Version("3.0")) >= 0); //$NON-NLS-1$ cluster.setcompatibility_version(version); cluster.setMigrateOnError(model.getMigrateOnErrorOption()); @@ -611,7 +611,8 @@ return; } else if (!returnValue.getSucceeded()) { - clusterModel.setMessage(returnValue.getExceptionString()); + clusterModel.setMessage(Frontend.getAppErrorsTranslator() + .TranslateErrorTextSingle(returnValue.getExceptionString())); return; } -- To view, visit http://gerrit.ovirt.org/10409 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a42f4d46dea10485ea1864deeddf66483fd8241 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <kmayi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
