diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 9c2c4d79bc3..580c9a6917c 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -2053,4 +2053,25 @@ state.Suspended=Suspended
ui.listView.filters.all=All
ui.listView.filters.mine=Mine
label.na=N/A
-label.added.network.offering=Added network offering
\ No newline at end of file
+label.added.network.offering=Added network offering
+hint.type.part.storage.tag=Type in part of a storage tag
+hint.type.part.host.tag=Type in part of a host tag
+hint.no.storage.tags=No storage tags found
+hint.no.host.tags=No host tags found
+label.availabilityZone=availabilityZone
+label.diskoffering=diskoffering
+title.upload.volume=Upload Volume
+label.format.lower=format
+label.checksum=checksum
+label.assign.vms=Assign VMs
+label.extractable.lower=extractable
+label.globo.dns=GloboDNS
+label.add.globo.dns=Add GloboDNS
+label.globo.dns.configuration=GloboDNS Configuration
+label.region.details=Region details
+label.baremetal.rack.configuration=Baremetal Rack Configuration
+label.add.baremetal.rack.configuration=Add Baremetal Rack Configuration
+label.delete.baremetal.rack.configuration=Delete Baremetal Rack Configuration
+message.confirm.delete.baremetal.rack.configuration=Please confirm that you want to delete Baremetal Rack Configuration.
+message.added.new.nuage.vsp.controller=Added new Nuage Vsp Controller
+message.added.vpc.offering=Added VPC offering
\ No newline at end of file
diff --git a/systemvm/js/cloud.logger.js b/systemvm/js/cloud.logger.js
index 751627ed96c..5e61accd16d 100644
--- a/systemvm/js/cloud.logger.js
+++ b/systemvm/js/cloud.logger.js
@@ -331,7 +331,7 @@ Logger.prototype = {
return '' + object;
}
} else {
- return 'N/A';
+ return 'label.na';
}
}
};
diff --git a/tools/ngui/static/js/app/storage/storage.js b/tools/ngui/static/js/app/storage/storage.js
index af36167e93c..12f27daaa07 100644
--- a/tools/ngui/static/js/app/storage/storage.js
+++ b/tools/ngui/static/js/app/storage/storage.js
@@ -53,13 +53,13 @@ angular.module("storage").controller("VolumesListCtrl", ["$scope", "$location",
{
model: 'name',
type: 'input-text',
- label: 'name',
+ label: 'label.name.lower',
required: true
},
{
model: 'zoneid',
type: 'select',
- label: 'availabilityZone',
+ label: 'label.availabilityZone',
options: Zones.getAll,
getValue: function(model){
return model.id;
@@ -71,7 +71,7 @@ angular.module("storage").controller("VolumesListCtrl", ["$scope", "$location",
{
model: 'diskofferingid',
type: 'select',
- label: 'diskoffering',
+ label: 'label.diskoffering',
options: DiskOfferings.getAll,
getValue: function(model){
return model.id;
@@ -84,18 +84,18 @@ angular.module("storage").controller("VolumesListCtrl", ["$scope", "$location",
};
$scope.uploadVolumeForm = {
- title: 'Upload Volume',
+ title: 'title.upload.volume',
onSubmit: Volumes.getAll,
fields: [
{
model: 'name',
type: 'input-text',
- label: 'name',
+ label: 'label.name.lower',
},
{
model: 'zoneid',
type: 'select',
- label: 'availabilityZone',
+ label: 'label.availabilityZone',
options: Zones.getAll,
getValue: function(model){
return model.id;
@@ -107,7 +107,7 @@ angular.module("storage").controller("VolumesListCtrl", ["$scope", "$location",
{
model: 'format',
type: 'select',
- label: 'format',
+ label: 'label.format.lower',
options: function(){
return ['RAW', 'VHD', 'OVA', 'QCOW2'];
},
@@ -121,12 +121,12 @@ angular.module("storage").controller("VolumesListCtrl", ["$scope", "$location",
{
model: 'url',
type: 'input-text',
- label: 'url'
+ label: 'label.url'
},
{
model: 'checksum',
type: 'input-text',
- label: 'checksum'
+ label: 'label.checksum'
}
],
}
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 7bc8c3723c3..7b916353654 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1013,5 +1013,26 @@ $.extend(dictionary, {
'label.na': '',
'label.migrate.volume': '',
'label.added.network.offering': '',
+'hint.type.part.storage.tag': '',
+'hint.type.part.host.tag': '',
+'hint.no.storage.tags': '',
+'hint.no.host.tags': '',
+'label.availabilityZone': '',
+'label.diskoffering': '',
+'title.upload.volume': '',
+'label.format.lower': '',
+'label.checksum': '',
+'label.assign.vms': '',
+'label.extractable.lower': '',
+'label.globo.dns': '',
+'label.add.globo.dns': '',
+'label.globo.dns.configuration': '',
+'label.region.details': '',
+'label.baremetal.rack.configuration': '',
+'label.add.baremetal.rack.configuration': '',
+'label.delete.baremetal.rack.configuration': '',
+'message.confirm.delete.baremetal.rack.configuration': '',
+'message.added.new.nuage.vsp.controller': '',
+'message.added.vpc.offering': '',
});
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 763d86ba084..0e673b3a4ab 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -327,8 +327,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a storage tag",
- noResultsText: "No storage tags found"
+ hintText: _l('hint.type.part.storage.tag'),
+ noResultsText: _l('hint.no.storage.tags')
});
},
error: function(XMLHttpResponse) {
@@ -363,8 +363,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a host tag",
- noResultsText: "No host tags found"
+ hintText: _l('hint.type.part.host.tag'),
+ noResultsText: _l('hint.no.host.tags')
});
},
error: function(XMLHttpResponse) {
@@ -1852,8 +1852,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a storage tag",
- noResultsText: "No storage tags found"
+ hintText: _l('hint.type.part.storage.tag'),
+ noResultsText: _l('hint.no.storage.tags')
});
},
error: function(XMLHttpResponse) {
@@ -3792,7 +3792,7 @@
messages: {
notification: function(args) {
- return 'Added VPC offering';
+ return 'message.added.vpc.offering';
}
}
}
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 702799c7963..2b1fe5c905e 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -237,10 +237,10 @@
},
baremetalRct: {
type: 'select',
- title: 'Baremetal Rack Configuration',
+ title: 'label.baremetal.rack.configuration',
listView: {
id: 'baremetalRct',
- label: 'Baremetal Rack Configuration',
+ label: 'label.baremetal.rack.configuration',
fields: {
id: {
label: 'label.id'
@@ -263,14 +263,14 @@
},
actions: {
add: {
- label: 'Add Baremetal Rack Configuration',
+ label: 'label.add.baremetal.rack.configuration',
messages: {
notification: function(args) {
- return 'Add Baremetal Rack Configuration';
+ return 'label.add.baremetal.rack.configuration';
}
},
createForm: {
- title: 'Add Baremetal Rack Configuration',
+ title: 'label.add.baremetal.rack.configuration',
fields: {
url: {
label: 'label.url',
@@ -309,13 +309,13 @@
name: "details",
actions: {
remove: {
- label: 'Delete Baremetal Rack Configuration',
+ label: 'label.delete.baremetal.rack.configuration',
messages: {
confirm: function(args) {
- return 'Please confirm that you want to delete Baremetal Rack Configuration.';
+ return 'message.confirm.delete.baremetal.rack.configuration';
},
notification: function(args) {
- return 'Delete Baremetal Rack Configuration';
+ return 'label.delete.baremetal.rack.configuration';
}
},
action: function(args) {
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index 4899c92f22a..950a2383d57 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -143,10 +143,10 @@
});
},
detailView: {
- name: 'Region details',
+ name: 'label.region.details',
viewAll: [{
path: 'regions.GSLB',
- label: 'GSLB'
+ label: 'label.gslb'
}, {
path: 'network.vpc',
label: 'label.regionlevelvpc'
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index e628c61af97..3608f4d58f7 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1515,7 +1515,7 @@
label: 'label.status'
},
diskofferingdisplaytext: {
- label: 'Disk Offering'
+ label: 'label.disk.offering'
},
type: {
label: 'label.type'
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c8a5bb81dcc..b6a35a32e05 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -30,7 +30,7 @@
var routerType = _l('label.menu.system');
if (router.projectid) routerType = _l('label.project');
- if (router.vpcid) routerType = 'VPC';
+ if (router.vpcid) routerType = _l('label.vpc');
return $.extend(router, {
routerType: routerType
@@ -1281,7 +1281,7 @@
isEditable: true
},
tags: {
- label: 'Tags',
+ label: 'label.tags',
isEditable: true
},
broadcastdomainrange: {
@@ -7432,7 +7432,7 @@
isMaximized: true,
type: 'detailView',
id: 'globoDnsProvider',
- label: 'GloboDNS',
+ label: 'label.globo.dns',
tabs: {
details: {
title: 'label.details',
@@ -7463,26 +7463,26 @@
},
actions: {
add: {
- label: 'GloboDNS Configuration',
+ label: 'label.globo.dns.configuration',
createForm: {
- title: 'GloboDNS Configuration',
+ title: 'label.globo.dns.configuration',
preFilter: function(args) {},
fields: {
username: {
- label: 'Username',
+ label: 'label.username',
validation: {
required: true
}
},
password: {
- label: 'Password',
+ label: 'label.password',
isPassword: true,
validation: {
required: true
}
},
url: {
- label: 'URL',
+ label: 'label.url',
validation: {
required: true
}
@@ -7529,7 +7529,7 @@
},
messages: {
notification: function(args) {
- return 'Add GloboDNS';
+ return 'label.add.globo.dns';
}
},
notification: {
@@ -12947,7 +12947,7 @@
messages: {
notification: function(args) {
- return 'Added new Nuage Vsp Controller';
+ return 'message.added.new.nuage.vsp.controller';
}
},
notification: {
@@ -15483,8 +15483,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a host tag",
- noResultsText: "No host tags found"
+ hintText: _l('hint.type.part.host.tag'),
+ noResultsText: _l('hint.no.host.tags')
});
},
error: function(XMLHttpResponse) {
@@ -16078,8 +16078,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a host tag",
- noResultsText: "No host tags found"
+ hintText: _l('hint.type.part.host.tag'),
+ noResultsText: _l('hint.no.host.tags')
});
},
error: function(XMLHttpResponse) {
@@ -17115,7 +17115,7 @@
}
},
url: {
- label: 'URL',
+ label: 'label.url',
docID: 'helpUrl',
validation: {
required: false
@@ -17259,8 +17259,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a storage tag",
- noResultsText: "No storage tags found"
+ hintText: _l('hint.type.part.storage.tag'),
+ noResultsText: _l('hint.no.storage.tags')
});
},
error: function(XMLHttpResponse) {
@@ -17624,8 +17624,8 @@
args.response.success({
data: tags,
- hintText: "Type in part of a storage tag",
- noResultsText: "No storage tags found"
+ hintText: _l('hint.type.part.storage.tag'),
+ noResultsText: _l('hint.no.storage.tags')
});
},
error: function(XMLHttpResponse) {
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 28145d50e80..deb836bae8d 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -906,7 +906,7 @@
}
},
isextractable: {
- label: 'label.extractable',
+ label: 'label.extractable.lower',
isBoolean: true,
isEditable: function() {
if (isAdmin())
@@ -1304,7 +1304,7 @@
}
},
isextractable: {
- label: 'extractable',
+ label: 'label.extractable.lower',
isBoolean: true,
isEditable: function() {
if (isAdmin())
@@ -1321,7 +1321,7 @@
converter: cloudStack.converters.toBooleanText
},
isdynamicallyscalable: {
- label: 'Dynamically Scalable',
+ label: 'label.dynamically.scalable',
isBoolean: true,
isEditable: true,
converter: cloudStack.converters.toBooleanText
@@ -1943,7 +1943,7 @@
}
},
isextractable: {
- label: 'label.extractable',
+ label: 'label.extractable.lower',
isBoolean: true,
isEditable: function() {
if (isAdmin())
@@ -2208,7 +2208,7 @@
}
}, {
id: {
- label: 'ID'
+ label: 'label.id'
},
zonename: {
label: 'label.zone.name'
@@ -2241,7 +2241,7 @@
}
},
isextractable: {
- label: 'extractable',
+ label: 'label.extractable.lower',
isBoolean: true,
isEditable: function() {
if (isAdmin())
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index af19d8714eb..0770cb2c07f 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -17,10 +17,10 @@
(function($, cloudStack) {
var assignVMAction = function() {
return {
- label: 'Assign VMs',
+ label: 'label.assign.vms',
messages: {
notification: function(args) {
- return 'Assign VMs';
+ return 'label.assign.vms';
}
},
needsRefresh: true,