apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes: Hardcoded strings externalized from various JS files.

Browse Source 
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
This commit is contained in:
vetrivelc 2014-11-21 19:28:01 +05:30 committed by Brian Federle
parent 1091d45809
commit 66e805cba9
11 changed files with 98 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
systemvm/js/cloud.logger.js
View File

@ -331,7 +331,7 @@ Logger.prototype = {
return '' + object;
}
} else {
return 'N/A';
return 'label.na';
}
}
};

18
tools/ngui/static/js/app/storage/storage.js
View File

@ -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'
}
],
}

21
ui/dictionary2.jsp
View File

@ -1013,5 +1013,26 @@ $.extend(dictionary, {
'label.na': '<fmt:message key="label.na" />',
'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
'label.added.network.offering': '<fmt:message key="label.added.network.offering" />',
'hint.type.part.storage.tag': '<fmt:message key="hint.type.part.storage.tag" />',
'hint.type.part.host.tag': '<fmt:message key="hint.type.part.host.tag" />',
'hint.no.storage.tags': '<fmt:message key="hint.no.storage.tags" />',
'hint.no.host.tags': '<fmt:message key="hint.no.host.tags" />',
'label.availabilityZone': '<fmt:message key="label.availabilityZone" />',
'label.diskoffering': '<fmt:message key="label.diskoffering" />',
'title.upload.volume': '<fmt:message key="title.upload.volume" />',
'label.format.lower': '<fmt:message key="label.format.lower" />',
'label.checksum': '<fmt:message key="label.checksum" />',
'label.assign.vms': '<fmt:message key="label.assign.vms" />',
'label.extractable.lower': '<fmt:message key="label.extractable.lower" />',
'label.globo.dns': '<fmt:message key="label.globo.dns" />',
'label.add.globo.dns': '<fmt:message key="label.add.globo.dns" />',
'label.globo.dns.configuration': '<fmt:message key="label.globo.dns.configuration" />',
'label.region.details': '<fmt:message key="label.region.details" />',
'label.baremetal.rack.configuration': '<fmt:message key="label.baremetal.rack.configuration" />',
'label.add.baremetal.rack.configuration': '<fmt:message key="label.add.baremetal.rack.configuration" />',
'label.delete.baremetal.rack.configuration': '<fmt:message key="label.delete.baremetal.rack.configuration" />',
'message.confirm.delete.baremetal.rack.configuration': '<fmt:message key="message.confirm.delete.baremetal.rack.configuration" />',
'message.added.new.nuage.vsp.controller': '<fmt:message key="message.added.new.nuage.vsp.controller" />',
'message.added.vpc.offering': '<fmt:message key="message.added.vpc.offering" />',
});
</script>

14
ui/scripts/configuration.js
View File

@ -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';
}
}
}

16
ui/scripts/globalSettings.js
View File

@ -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) {

4
ui/scripts/regions.js
View File

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

2
ui/scripts/storage.js
View File

@ -1515,7 +1515,7 @@
label: 'label.status'
},
diskofferingdisplaytext: {
label: 'Disk Offering'
label: 'label.disk.offering'
},
type: {
label: 'label.type'

38
ui/scripts/system.js
View File

@ -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) {

12
ui/scripts/templates.js
View File

@ -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())

4
ui/scripts/vpc.js
View File

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