diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index a89a95a8ce3..8ed363e9df6 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -426,6 +426,8 @@ label.action.stop.instance=Stop Instance label.action.stop.instance.processing=Stopping Instance.... label.action.reboot.instance=Reboot Instance label.action.reboot.instance.processing=Rebooting Instance.... +label.action.destroy.instance=Destroy Instance +label.action.destroy.instance.processing=Destroying Instance.... label.action.edit.account=Edit account label.action.resource.limits=Resource limits @@ -453,6 +455,7 @@ label.action.delete.user.processing=Deleting User.... message.action.start.instance=Please confirm you want to start instance message.action.stop.instance=Please confirm you want to stop instance message.action.reboot.instance=Please confirm you want to reboot instance +message.action.destroy.instance=Please confirm you want to destroy instance 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/instance.jsp b/ui/jsp/instance.jsp index b4d2166f4ff..fba252b570b 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -15,7 +15,10 @@ dictionary = { 'message.action.stop.instance' : '', 'label.action.reboot.instance' : '', 'label.action.reboot.instance.processing' : '', - 'message.action.reboot.instance' : '' + 'message.action.reboot.instance' : '', + 'label.action.destroy.instance' : '', + 'label.action.destroy.instance.processing' : '', + 'message.action.destroy.instance' : '' }; diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index 381fe9b5ffc..b443ae82811 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -294,15 +294,15 @@ function bindDestroyVMButton() { } $("#dialog_confirmation") - .text("Please confirm you want to destroy instance") + .text(dictionary["message.action.destroy.instance"]) .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); var apiInfo = { - label: "Destroy Instance", + label: "label.action.destroy.instance", isAsyncJob: true, - inProcessText: "Destroying Instance....", + inProcessText: "label.action.destroy.instance.processing", asyncJobResponse: "destroyvirtualmachineresponse", afterActionSeccessFn: function(json, $midmenuItem1, id) { var jsonObj = json.queryasyncjobresultresponse.jobresult.virtualmachine;