etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 4556: ISO page - localize all actions.

This commit is contained in:
Jessica Wang 2011-01-27 17:15:47 -08:00
parent 6b91ba441b
commit bf50d61bf6
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/WEB-INF/classes/resources/messages.properties
View File

@ -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.

14
ui/jsp/iso.jsp
View File

@ -5,6 +5,20 @@
</c:if>
<fmt:setBundle basename="resources/messages"/>
<script language="javascript">
dictionary = {
'label.action.edit.ISO' : '<fmt:message key="label.action.edit.ISO"/>',
'label.action.delete.ISO' : '<fmt:message key="label.action.delete.ISO"/>',
'label.action.delete.ISO.processing' : '<fmt:message key="label.action.delete.ISO.processing"/>',
'message.action.delete.ISO' : '<fmt:message key="message.action.delete.ISO"/>',
'message.action.delete.ISO.for.all.zones' : '<fmt:message key="message.action.delete.ISO.for.all.zones"/>',
'label.action.copy.ISO' : '<fmt:message key="label.action.copy.ISO"/>',
'label.action.copy.ISO.processing' : '<fmt:message key="label.action.copy.ISO.processing"/>',
'label.action.create.vm' : '<fmt:message key="label.action.create.vm"/>',
'label.action.create.vm.processing' : '<fmt:message key="label.action.create.vm.processing"/>',
'label.action.download.ISO' : '<fmt:message key="label.action.download.ISO"/>'
};
</script>
<!-- ISO detail panel (begin) -->
<div class="main_title" id="right_panel_header">

30
ui/scripts/cloud.core.iso.js
View File

@ -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', {