diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 5268bc17a1c..80b5fdac48e 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -482,6 +482,14 @@ label.action.create.vm=Create VM
label.action.create.vm.processing=Creating VM....
label.action.download.template=Download Template
+label.action.edit.ISO=Edit ISO
+label.action.delete.ISO=Delete ISO
+label.action.delete.ISO.processing=Deleting ISO....
+label.action.copy.ISO=Copy ISO
+label.action.copy.ISO.processing=Coping ISO....
+label.action.download.ISO=Download ISO
+
+
label.action.edit.account=Edit account
label.action.resource.limits=Resource limits
@@ -525,6 +533,9 @@ message.action.delete.ingress.rule=Please confirm you want to delete ingress rul
message.action.delete.template=Please confirm you want to delete template
message.action.delete.template.for.all.zones=The template is used by all zones. Please confirm you want to delete it from all zones.
+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.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.
message.lock.account=Please confirm you want to lock this account. By locking the account, all users for this account will no longer be able to manage their cloud resources. Existing resources can still be accessed.
diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 0aad75117af..c0d146c4b6a 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -5,6 +5,20 @@
+
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 54e03903d92..525721c6421 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -343,11 +343,11 @@ function isoJsonToDetailsTab() {
//do nothing
}
else {
- buildActionLinkForTab("Edit ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.edit.ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
if(jsonObj.id != xsToolsIsoId)
- buildActionLinkForTab("Copy ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.copy.ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
}
// "Create VM"
@@ -361,7 +361,7 @@ function isoJsonToDetailsTab() {
//do nothing
}
else {
- buildActionLinkForTab("Create VM", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.create.vm", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
*/
@@ -374,7 +374,7 @@ function isoJsonToDetailsTab() {
//do nothing
}
else {
- buildActionLinkForTab("Download ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.download.ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@@ -386,7 +386,7 @@ function isoJsonToDetailsTab() {
//do nothing
}
else {
- buildActionLinkForTab("Delete ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
+ buildActionLinkForTab("label.action.delete.ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@@ -437,14 +437,14 @@ function isoClearDetailsTab() {
}
var isoActionMap = {
- "Edit ISO": {
+ "label.action.edit.ISO": {
dialogBeforeActionFn: doEditISO
},
- "Delete ISO": {
+ "label.action.delete.ISO": {
isAsyncJob: true,
asyncJobResponse: "deleteisosresponse",
dialogBeforeActionFn: doDeleteIso,
- inProcessText: "Deleting ISO....",
+ inProcessText: "label.action.delete.ISO.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id){
$midmenuItem1.slideUp("slow", function() {
$(this).remove();
@@ -455,22 +455,22 @@ var isoActionMap = {
});
}
},
- "Copy ISO": {
+ "label.action.copy.ISO": {
isAsyncJob: true,
asyncJobResponse: "copyisoresponse",
dialogBeforeActionFn: doCopyIso,
- inProcessText: "Copying ISO....",
+ inProcessText: "label.action.copy.ISO.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id){}
}
,
- "Create VM": {
+ "label.action.create.vm": {
isAsyncJob: true,
asyncJobResponse: "deployvirtualmachineresponse",
dialogBeforeActionFn: doCreateVMFromIso,
- inProcessText: "Creating VM....",
+ inProcessText: "label.action.create.vm.processing",
afterActionSeccessFn: function(json, $midmenuItem1, id){}
},
- "Download ISO": {
+ "label.action.download.ISO": {
dialogBeforeActionFn : doDownloadISO
}
}
@@ -574,9 +574,9 @@ function doDeleteIso($actionLink, $detailsTab, $midmenuItem1) {
var $dialog1;
if(jsonObj.crossZones == true)
- $dialog1 = $("#dialog_confirmation").text("The ISO is used by all zones. Please confirm you want to delete it from all zones.");
+ $dialog1 = $("#dialog_confirmation").text(dictionary["message.action.delete.ISO.for.all.zones"]);
else
- $dialog1 = $("#dialog_confirmation").text("Please confirm you want to delete the ISO");
+ $dialog1 = $("#dialog_confirmation").text(dictionary["message.action.delete.ISO"]);
$dialog1
.dialog('option', 'buttons', {