From 3b7035091071ba83882097298a1f6f7c7151dd4a Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 27 Jan 2011 18:05:16 -0800 Subject: [PATCH] bug 4556: cluster page - localize all actions. --- client/WEB-INF/classes/resources/messages.properties | 6 ++++-- ui/jsp/cluster.jsp | 8 ++++++++ ui/scripts/cloud.core.cluster.js | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index cd22eed8eec..2c7c535a541 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -523,6 +523,9 @@ label.action.edit.pod=Edit Pod label.action.delete.pod=Delete Pod label.action.delete.pod.processing=Deleting Pod.... +label.action.delete.cluster=Delete Cluster +label.action.delete.cluster.processing=Deleting Cluster.... + #Messages message.action.start.instance=Please confirm you want to start instance message.action.stop.instance=Please confirm you want to stop instance @@ -547,10 +550,9 @@ message.action.delete.ISO=Please confirm you want to delete ISO message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please confirm you want to delete it from all zones. message.action.delete.domain=Please confirm you want to delete domain - message.action.delete.zone=Please confirm you want to delete zone - message.action.delete.pod=Please confirm you want to delete pod +message.action.delete.cluster=Please confirm you want to delete cluster message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create. message.disable.account=Please confirm you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down. diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp index 94bbf19f32d..ed9a6b6917c 100644 --- a/ui/jsp/cluster.jsp +++ b/ui/jsp/cluster.jsp @@ -5,6 +5,14 @@ + +
diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js index daedc3beb36..6b8dd421778 100644 --- a/ui/scripts/cloud.core.cluster.js +++ b/ui/scripts/cloud.core.cluster.js @@ -85,7 +85,7 @@ function clusterJsonToDetailsTab() { }); var $actionMenu = $thisTab.find("#action_link #action_menu"); $actionMenu.find("#action_list").empty(); - buildActionLinkForTab("Delete Cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.delete.cluster", clusterActionMap, $actionMenu, $midmenuItem1, $thisTab); } function clusterClearDetailsTab() { @@ -105,11 +105,11 @@ function clusterClearDetailsTab() { } var clusterActionMap = { - "Delete Cluster": { + "label.action.delete.cluster": { api: "deleteCluster", isAsyncJob: false, dialogBeforeActionFn : doDeleteCluster, - inProcessText: "Deleting Cluster....", + inProcessText: "label.action.delete.cluster.processing", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function() { $(this).remove(); @@ -127,7 +127,7 @@ function doDeleteCluster($actionLink, $detailsTab, $midmenuItem1) { var id = jsonObj.id; $("#dialog_confirmation") - .text("Please confirm you want to delete this cluster") + .text(dictionary["message.action.delete.cluster"]) .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close");