%
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 731774e2bf4..edb732eaa55 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -553,13 +553,9 @@
})
},
- messages: {
- confirm: function(args) { //never being called
- return 'Are you sure you want to deploy an instance?';
- },
- notification: function(args) {
- //return 'Creating new VM: ' + args.name; //args.name is not available
- return 'Creating new VM';
+ messages: {
+ notification: function(args) {
+ return 'label.vm.add';
}
},
notification: {
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 91589f0b972..44f39bb0e23 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -358,13 +358,13 @@ cloudStack.converters = {
toAlertType: function(alertCode) {
switch (alertCode) {
case 0 : return _l('label.memory');
- case 1 : return 'CPU';
+ case 1 : return _l('label.cpu');
case 2 : return _l('label.storage');
case 3 : return _l('label.primary.storage');
case 4 : return _l('label.public.ips');
case 5 : return _l('label.management.ips');
case 6 : return _l('label.secondary.storage');
- case 7 : return 'VLAN';
+ case 7 : return _l('label.vlan');
case 8 : return _l('label.direct.ips');
case 9 : return _l('label.local.storage');
diff --git a/ui/scripts/ui-custom/zoneChart.js b/ui/scripts/ui-custom/zoneChart.js
index cbf010ae1bd..7c4951a2ad2 100644
--- a/ui/scripts/ui-custom/zoneChart.js
+++ b/ui/scripts/ui-custom/zoneChart.js
@@ -339,7 +339,7 @@
var chartItems = {
// The keys are based on the internal type ID associated with each capacity
0: { name: _l('label.memory') },
- 1: { name: 'CPU' },
+ 1: { name: _l('label.cpu') },
2: { name: _l('label.storage') },
3: { name: _l('label.primary.allocated') },
6: { name: _l('label.secondary.storage') },
@@ -347,7 +347,7 @@
4: { name: _l('label.public.ips') },
5: { name: _l('label.management.ips') },
8: { name: _l('label.direct.ips') },
- 7: { name: 'VLAN' }
+ 7: { name: _l('label.vlan') }
};
$top.append($title);