diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index b035a64780d..ce3164f64a4 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -461,6 +461,13 @@ label.action.create.volume.processing=Creating Volume.... label.action.delete.snapshot=Delete Snapshot label.action.delete.snapshot.processing=Deleting Snapshot.... +label.action.release.ip=Release IP +label.action.release.ip.processing=Releasing IP.... +label.action.enable.static.NAT=Enable Static NAT +label.action.enable.static.NAT.processing=Enabling Static NAT.... +label.action.disable.static.NAT=Disable Static NAT +label.action.disable.static.NAT.processing=Disabling Static NAT.... + label.action.edit.account=Edit account label.action.resource.limits=Resource limits label.action.disable.account=Disable account @@ -494,6 +501,8 @@ 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.action.release.ip=Please confirm you want to release IP +message.action.disable.static.NAT=Please confirm you want to disable static NAT 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/ipaddress.jsp b/ui/jsp/ipaddress.jsp index 70a967325ec..39bf5da7486 100644 --- a/ui/jsp/ipaddress.jsp +++ b/ui/jsp/ipaddress.jsp @@ -5,6 +5,18 @@ +
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 64f69040aa5..e015bc6130e 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -1142,7 +1142,7 @@ function ipJsonToDetailsTab() { ipPopulateVMDropdown($vmSelect); if(ipObj.isstaticnat == true) { - buildActionLinkForTab("Disable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.disable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); noAvailableActions = false; } else { if(ipObj.issourcenat != true) { @@ -1152,12 +1152,12 @@ function ipJsonToDetailsTab() { var staticNatCapabilityObj = ipFindCapabilityByName("StaticNat", firewallServiceObj); if(staticNatCapabilityObj != null) { if(staticNatCapabilityObj.value == "true") - buildActionLinkForTab("Enable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.enable.static.NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); } } } - buildActionLinkForTab("Release IP", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.release.ip", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); noAvailableActions = false; } } @@ -1228,10 +1228,10 @@ function setNetworkTypeField(value, $field) { } var ipActionMap = { - "Release IP": { + "label.action.release.ip": { isAsyncJob: false, dialogBeforeActionFn : doReleaseIp, - inProcessText: "Releasing IP....", + inProcessText: "label.action.release.ip.processing", afterActionSeccessFn: function(json, $midmenuItem1, id) { $midmenuItem1.slideUp("slow", function(){ $(this).remove(); @@ -1243,10 +1243,10 @@ var ipActionMap = { } }, - "Enable Static NAT": { + "label.action.enable.static.NAT": { isAsyncJob: false, dialogBeforeActionFn: doEnableStaticNAT, - inProcessText: "Enabling Static NAT....", + inProcessText: "label.action.enable.static.NAT.processing", afterActionSeccessFn: function(json, $midmenuItem1, id) { //id is ipaddress if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#ipaddress").text()) { //id is ipaddress $.ajax({ @@ -1263,11 +1263,11 @@ var ipActionMap = { } } }, - "Disable Static NAT": { + "label.action.disable.static.NAT": { isAsyncJob: true, asyncJobResponse: "disablestaticnatresponse", dialogBeforeActionFn: doDisableStaticNAT, - inProcessText: "Disabling Static NAT....", + inProcessText: "label.action.disable.static.NAT.processing", afterActionSeccessFn: function(json, $midmenuItem1, id) { //id is ipaddress if(id.toString() == $("#right_panel_content").find("#tab_content_details").find("#ipaddress").text()) { //id is ipaddress $.ajax({ @@ -1291,7 +1291,7 @@ function doReleaseIp($actionLink, $detailsTab, $midmenuItem1) { var ipaddress = jsonObj.ipaddress; $("#dialog_confirmation") - .text("Please confirm you want to release this IP address") + .text(dictionary["message.action.release.ip"]) .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -1334,7 +1334,7 @@ function doDisableStaticNAT($actionLink, $detailsTab, $midmenuItem1) { var ipaddress = jsonObj.ipaddress; $("#dialog_info") - .text("Please confirm you want to disable static NAT") + .text(dictionary["message.action.disable.static.NAT"]) .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close");