Updated Branches: refs/heads/master db91e54bf -> e171cb181
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 242fa80..8159124 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -584,15 +584,15 @@ isEditable: true }, ovmnetworklabel: { - label: 'OVM traffic label', + label: 'label.ovm.traffic.label', isEditable: true }, lxcnetworklabel: { - label: 'LXC Traffic Label', + label: 'label.lxc.traffic.label', isEditable: true }, hypervnetworklabel: { - label: 'HyperV Traffic Label', + label: 'label.hyperv.traffic.label', isEditable: true } }], @@ -16061,16 +16061,16 @@ }, actions: { add: { - label: 'Add UCS Manager', + label: 'label.add.ucs.manager', messages: { notification: function (args) { - return 'Add UCS Manager'; + return 'label.add.ucs.manager'; } }, createForm: { - title: 'Add UCS Manager', + title: 'label.add.ucs.manager', fields: { name: { label: 'label.name', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e171cb18/ui/scripts/templates.js ---------------------------------------------------------------------- diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 8c63ce2..716c615 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -63,10 +63,10 @@ advSearchFields: { name: { - label: 'Name' + label: 'label.name' }, zoneid: { - label: 'Zone', + label: 'label.zone', select: function(args) { $.ajax({ url: createURL('listZones'), @@ -706,14 +706,14 @@ //do nothing } else if (result.jobstatus == 2) { cloudStack.dialog.notice({ - message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + _s(result.jobresult.errortext) + message: "message.XSTools61plus.update.failed" + " " + _s(result.jobresult.errortext) }); } } }, error: function(XMLHttpResponse) { cloudStack.dialog.notice({ - message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + parseXMLHttpResponse(XMLHttpResponse) + message: "message.XSTools61plus.update.failed" + " " + parseXMLHttpResponse(XMLHttpResponse) }); } }); @@ -749,10 +749,10 @@ label: 'label.action.copy.template', messages: { confirm: function(args) { - return 'Are you sure you want to copy template?'; + return 'message.copy.template.confirm'; }, success: function(args) { - return 'Template is being copied.'; + return 'message.template.copying'; }, notification: function(args) { return 'label.action.copy.template'; @@ -837,7 +837,7 @@ return 'message.action.download.template'; }, notification: function(args) { - return 'Downloading template'; + return 'message.action.downloading.template'; }, complete: function(args) { var url = args.url; @@ -940,7 +940,7 @@ } }, { id: { - label: 'ID' + label: 'label.id' }, zonename: { label: 'label.zone.name' @@ -1350,10 +1350,10 @@ advSearchFields: { name: { - label: 'Name' + label: 'label.name' }, zoneid: { - label: 'Zone', + label: 'label.zone', select: function(args) { $.ajax({ url: createURL('listZones'), @@ -1376,10 +1376,10 @@ } }, tagKey: { - label: 'Tag Key' + label: 'label.tag.key' }, tagValue: { - label: 'Tag Value' + label: 'label.tag.value' } },
