From ac8d1b725e55a37323efd4c059373a3f18817726 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 27 Jan 2011 15:13:38 -0800
Subject: [PATCH] bug 4556: volume page - snapshot tab - localize all actions.

---
 .../WEB-INF/classes/resources/messages.properties  |  6 ++++++
 ui/jsp/volume.jsp                                  |  7 ++++++-
 ui/scripts/cloud.core.volume.js                    | 14 +++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 4eb520fa699..b035a64780d 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -456,6 +456,10 @@ label.action.recurring.snapshot=Recurring Snapshot
 label.action.download.volume=Download Volume
 label.action.download.volume.processing=Downloading Volume....
 
+label.action.create.volume=Create Volume
+label.action.create.volume.processing=Creating Volume....
+label.action.delete.snapshot=Delete Snapshot
+label.action.delete.snapshot.processing=Deleting Snapshot....
 
 label.action.edit.account=Edit account
 label.action.resource.limits=Resource limits
@@ -488,6 +492,8 @@ message.action.restore.instance=Please confirm you want to restore instance
 
 message.action.delete.volume=Please confirm you want to delete volume
 message.action.take.snapshot=Please confirm you want to take snapshot
+message.action.delete.snapshot=Please confirm you want to delete snapshot
+
 
 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/volume.jsp b/ui/jsp/volume.jsp
index 845ff45cae2..ecbf6d03e36 100644
--- a/ui/jsp/volume.jsp
+++ b/ui/jsp/volume.jsp
@@ -20,7 +20,12 @@ dictionary = {
 	'label.action.take.snapshot.processing' : '<fmt:message key="label.action.take.snapshot.processing"/>',
 	'message.action.take.snapshot' : '<fmt:message key="message.action.take.snapshot"/>',
 	'label.action.recurring.snapshot' : '<fmt:message key="label.action.recurring.snapshot"/>',
-	'label.action.download.volume' : '<fmt:message key="label.action.download.volume"/>'
+	'label.action.download.volume' : '<fmt:message key="label.action.download.volume"/>',
+	'label.action.create.volume' : '<fmt:message key="label.action.create.volume"/>',
+	'label.action.create.volume.processing' : '<fmt:message key="label.action.create.volume.processing"/>',
+	'label.action.delete.snapshot' : '<fmt:message key="label.action.delete.snapshot"/>',
+	'label.action.delete.snapshot.processing' : '<fmt:message key="label.action.delete.snapshot.processing"/>',
+	'message.action.delete.snapshot' : '<fmt:message key="message.action.delete.snapshot"/>'
 };	
 </script>
 
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index dceb032d6d1..fb8bb8bf86e 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -486,8 +486,8 @@ function volumeSnapshotJSONToTemplate(jsonObj, template) {
 	var $actionMenu = $actionLink.find("#snapshot_action_menu");
     $actionMenu.find("#action_list").empty();	
     
-    buildActionLinkForSubgridItem("Create Volume", volumeSnapshotActionMap, $actionMenu, template);	
-    buildActionLinkForSubgridItem("Delete Snapshot", volumeSnapshotActionMap, $actionMenu, template);	
+    buildActionLinkForSubgridItem("label.action.create.volume", volumeSnapshotActionMap, $actionMenu, template);	
+    buildActionLinkForSubgridItem("label.action.delete.snapshot", volumeSnapshotActionMap, $actionMenu, template);	
     buildActionLinkForSubgridItem("label.action.create.template", volumeSnapshotActionMap, $actionMenu, template);	
 } 
  
@@ -976,11 +976,11 @@ function doAttachDisk($actionLink, $detailsTab, $midmenuItem1) {
 
 //Snapshot tab actions
 var volumeSnapshotActionMap = {  
-    "Create Volume": {              
+    "label.action.create.volume": {              
         isAsyncJob: true,
         asyncJobResponse: "createvolumeresponse",
         dialogBeforeActionFn : doCreateVolumeFromSnapshotInVolumePage,
-        inProcessText: "Creating Volume....",
+        inProcessText: "label.action.create.volume.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {   
             var $midmenuItem1 = $("#midmenu_item").clone();		        
             var item = json.queryasyncjobresultresponse.jobresult.volume;		   
@@ -992,12 +992,12 @@ var volumeSnapshotActionMap = {
         }
     }   
     , 
-    "Delete Snapshot": {              
+    "label.action.delete.snapshot": {              
         api: "deleteSnapshot",     
         isAsyncJob: true,
         asyncJobResponse: "deletesnapshotresponse",
 		dialogBeforeActionFn : doSnapshotDelete,
-        inProcessText: "Deleting snapshot....",
+        inProcessText: "label.action.delete.snapshot.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             $subgridItem.slideUp("slow", function() {
                 $(this).remove();
@@ -1016,7 +1016,7 @@ var volumeSnapshotActionMap = {
 
 function doSnapshotDelete($actionLink, $subgridItem) {
 	$("#dialog_confirmation")	
-	.text("Please confirm you want to delete the snapshot")
+	.text(dictionary["message.action.delete.snapshot"])
     .dialog('option', 'buttons', { 						
 	    "Confirm": function() { 
 		    $(this).dialog("close");