From 4fcd6dec89bb5911dab051413d68fe2e10ba1216 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 27 Jan 2011 19:45:46 -0800
Subject: [PATCH] bug 4556: network page - public network - localize all
 actions.

---
 .../classes/resources/messages.properties     |  7 ++++++
 ui/jsp/network.jsp                            | 11 +++++++++
 ui/scripts/cloud.core.network.js              | 24 +++++++++----------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 6fff8b6c4a6..a1dfb8dfbb4 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -544,6 +544,13 @@ label.action.delete.primary.storage.processing=Deleting Primary Storage....
 label.action.delete.secondary.storage=Delete Secondary Storage
 label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
 
+label.action.delete.IP.range=Delete IP Range
+label.action.delete.IP.range.processing=Deleting IP Range....
+label.action.delete.firewall=Delete Firewall
+label.action.delete.firewall.processing=Deleting Firewall....
+label.action.delete.load.balancer=Delete Load Balancer
+label.action.delete.load.balancer.processing=Deleting Load Balancer....
+
 #Messages
 message.action.start.instance=Please confirm you want to start instance
 message.action.stop.instance=Please confirm you want to stop instance
diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index d8a2103af59..07c969e77cc 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -5,6 +5,17 @@
 </c:if>
 <fmt:setBundle basename="resources/messages"/>
 
+<script language="javascript">
+dictionary = { 	
+	'label.action.delete.IP.range' : '<fmt:message key="label.action.delete.IP.range"/>',
+	'label.action.delete.IP.range.processing' : '<fmt:message key="label.action.delete.IP.range.processing"/>',
+	'label.action.delete.firewall' : '<fmt:message key="label.action.delete.firewall"/>',
+	'label.action.delete.firewall.processing' : '<fmt:message key="label.action.delete.firewall.processing"/>',
+	'label.action.delete.load.balancer' : '<fmt:message key="label.action.delete.load.balancer"/>',
+	'label.action.delete.load.balancer.processing' : '<fmt:message key="label.action.delete.load.balancer.processing"/>'
+};	
+</script>
+
 <div class="main_title" id="right_panel_header">
     <div class="main_titleicon">
         <img src="images/title_podicon.gif" /></div>
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 9570b1ea5dc..9d390af326f 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -247,7 +247,7 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
 	var $actionMenu = $actionLink.find("#iprange_action_menu");
     $actionMenu.find("#action_list").empty();	
        
-    buildActionLinkForSubgridItem("Delete IP Range", publicNetworkIpRangeActionMap, $actionMenu, $template);	
+    buildActionLinkForSubgridItem("label.action.delete.IP.range", publicNetworkIpRangeActionMap, $actionMenu, $template);	
 }
 
 function publicNetworkJsonToFirewallTab() {  
@@ -339,14 +339,14 @@ function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
 	var $actionMenu = $actionLink.find("#firewall_action_menu");
     $actionMenu.find("#action_list").empty();	
        
-    buildActionLinkForSubgridItem("Delete Firewall", publicNetworkFirewallActionMap, $actionMenu, $template);	
+    buildActionLinkForSubgridItem("label.action.delete.firewall", publicNetworkFirewallActionMap, $actionMenu, $template);	
 }
 
 var publicNetworkFirewallActionMap = {     
-    "Delete Firewall": {              
+    "label.action.delete.firewall": {              
         api: "deleteExternalFirewall",     
         isAsyncJob: false,      
-        inProcessText: "Deleting Firewall....",
+        inProcessText: "label.action.delete.firewall.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             $subgridItem.slideUp("slow", function() {
                 $(this).remove();
@@ -410,14 +410,14 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
 	var $actionMenu = $actionLink.find("#loadbalancer_action_menu");
     $actionMenu.find("#action_list").empty();	
        
-    buildActionLinkForSubgridItem("Delete Load Balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);	
+    buildActionLinkForSubgridItem("label.action.delete.load.balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);	
 }
 
 var publicNetworkLoadBalancerActionMap = {     
-    "Delete Load Balancer": {              
+    "label.action.delete.load.balancer": {              
         api: "deleteExternalLoadBalancer",     
         isAsyncJob: false,      
-        inProcessText: "Deleting Load Balancer....",
+        inProcessText: "label.action.delete.load.balancer.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             $subgridItem.slideUp("slow", function() {
                 $(this).remove();
@@ -771,10 +771,10 @@ function bindAddExternalFirewallButton($button, $midmenuItem1) {
 }
 
 var publicNetworkIpRangeActionMap = {     
-    "Delete IP Range": {              
+    "label.action.delete.IP.range": {              
         api: "deleteVlanIpRange",     
         isAsyncJob: false,   
-        inProcessText: "Deleting IP Range....",
+        inProcessText: "label.action.delete.IP.range.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             $subgridItem.slideUp("slow", function() {
                 $(this).remove();
@@ -1054,14 +1054,14 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
 	var $actionMenu = $actionLink.find("#iprange_action_menu");
     $actionMenu.find("#action_list").empty();	
        
-    buildActionLinkForSubgridItem("Delete IP Range", directNetworkIpRangeActionMap, $actionMenu, $template);
+    buildActionLinkForSubgridItem("label.action.delete.IP.range", directNetworkIpRangeActionMap, $actionMenu, $template);
 }
 
 var directNetworkIpRangeActionMap = {     
-    "Delete IP Range": {              
+    "label.action.delete.IP.range": {              
         api: "deleteVlanIpRange",     
         isAsyncJob: false,   
-        inProcessText: "Deleting IP Range....",
+        inProcessText: "label.action.delete.IP.range.processing",
         afterActionSeccessFn: function(json, id, $subgridItem) {                 
             $subgridItem.slideUp("slow", function() {
                 $(this).remove();