You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/03/08 01:22:53 UTC
[20/50] [abbrv] Externalized the hardcodedstrings from UI JAVASCRIPT
files.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/tools/ngui/static/js/app/accounts/accounts.js
----------------------------------------------------------------------
diff --git a/tools/ngui/static/js/app/accounts/accounts.js b/tools/ngui/static/js/app/accounts/accounts.js
index eae5070..61d825b 100644
--- a/tools/ngui/static/js/app/accounts/accounts.js
+++ b/tools/ngui/static/js/app/accounts/accounts.js
@@ -43,32 +43,32 @@ angular.module('accounts').controller('AccountsListCtrl', ['$scope', 'accounts',
{
model: 'username',
type: 'input-text',
- label: 'username'
+ label: 'label.username.lower'
},
{
model: 'password',
type: 'input-password',
- label: 'password'
+ label: 'label.password.lower'
},
{
model: 'email',
type: 'input-text',
- label: 'email'
+ label: 'label.email.lower'
},
{
model: 'firstname',
type: 'input-text',
- label: 'firstname'
+ label: 'label.firstname.lower'
},
{
model: 'lastname',
type: 'input-text',
- label: 'lastname'
+ label: 'label.lastname.lower'
},
{
model: 'domainid',
type: 'select',
- label: 'domain',
+ label: 'label.domain.lower',
options: Domains.fetch,
getName: function(model){
return model.name;
@@ -80,12 +80,12 @@ angular.module('accounts').controller('AccountsListCtrl', ['$scope', 'accounts',
{
model: 'account',
type: 'input-text',
- label: 'account'
+ label: 'label.account.lower'
},
{
model: 'accounttype',
type: 'select',
- label: 'type',
+ label: 'label.type.lower',
options: function(){
return ['User', 'Admin']
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/tools/ngui/static/js/app/storage/storage.js
----------------------------------------------------------------------
diff --git a/tools/ngui/static/js/app/storage/storage.js b/tools/ngui/static/js/app/storage/storage.js
index e562a95..af36167 100644
--- a/tools/ngui/static/js/app/storage/storage.js
+++ b/tools/ngui/static/js/app/storage/storage.js
@@ -47,7 +47,7 @@ angular.module("storage").controller("VolumesListCtrl", ["$scope", "$location",
$scope.toDisplay = ['name', 'type', 'hypervisor', 'vmdisplayname'];
$scope.addVolumeForm = {
- title: 'Add Volume',
+ title: 'label.add.volume',
onSubmit: Volumes.getAll,
fields: [
{
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 11dbeb5..074db7f 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -43,7 +43,6 @@ dictionary = {
'label.hypervisors': '<fmt:message key="label.hypervisors" />',
'label.home': '<fmt:message key="label.home" />',
'label.sockets': '<fmt:message key="label.sockets" />',
-'label.add.ucs.manager': '<fmt:message key="label.add.ucs.manager" />',
'label.root.disk.size': '<fmt:message key="label.root.disk.size" />',
'label.s3.nfs.path': '<fmt:message key="label.s3.nfs.path" />',
'label.s3.nfs.server': '<fmt:message key="label.s3.nfs.server" />',
@@ -704,9 +703,6 @@ dictionary = {
'label.keyboard.type': '<fmt:message key="label.keyboard.type" />',
'label.key': '<fmt:message key="label.key" />',
'label.kvm.traffic.label': '<fmt:message key="label.kvm.traffic.label" />',
-'label.ovm.traffic.label': '<fmt:message key="label.ovm.traffic.label" />',
-'label.lxc.traffic.label': '<fmt:message key="label.lxc.traffic.label" />',
-'label.hyperv.traffic.label': '<fmt:message key="label.hyperv.traffic.label" />',
'label.lang.chinese': '<fmt:message key="label.lang.chinese" />',
'label.lang.english': '<fmt:message key="label.lang.english" />',
'label.lang.japanese': '<fmt:message key="label.lang.japanese" />',
@@ -933,7 +929,6 @@ dictionary = {
'label.projects': '<fmt:message key="label.projects" />',
'label.project.view': '<fmt:message key="label.project.view" />',
'label.protocol': '<fmt:message key="label.protocol" />',
-'label.provider': '<fmt:message key="label.provider" />',
'label.providers': '<fmt:message key="label.providers" />',
'label.provider': '<fmt:message key="label.provider" />',
'label.public': '<fmt:message key="label.public" />',
@@ -1023,7 +1018,6 @@ dictionary = {
'label.security.group': '<fmt:message key="label.security.group" />',
'label.security.group.name': '<fmt:message key="label.security.group.name" />',
'label.security.groups.enabled': '<fmt:message key="label.security.groups.enabled" />',
-'label.security.groups': '<fmt:message key="label.security.groups" />',
'label.select.a.template': '<fmt:message key="label.select.a.template" />',
'label.select.a.zone': '<fmt:message key="label.select.a.zone" />',
'label.select': '<fmt:message key="label.select" />',
@@ -1184,7 +1178,6 @@ dictionary = {
'label.virtual.network': '<fmt:message key="label.virtual.network" />',
'label.virtual.router': '<fmt:message key="label.virtual.router" />',
'label.virtual.routers': '<fmt:message key="label.virtual.routers" />',
-'label.vlan': '<fmt:message key="label.vlan" />',
'label.vlan.id': '<fmt:message key="label.vlan.id" />',
'label.vlan.range': '<fmt:message key="label.vlan.range" />',
'label.vxlan': '<fmt:message key="label.vxlan" />',
@@ -1247,7 +1240,6 @@ dictionary = {
'label.ldap.group.name': '<fmt:message key="label.ldap.group.name" />',
'label.password.reset.confirm': '<fmt:message key="label.password.reset.confirm" />',
'label.openDaylight': '<fmt:message key="OpenDaylight" />',
-'label.change.affinity': '<fmt:message key="label.change.affinity" />',
'label.assign.instance.another': '<fmt:message key="label.assign.instance.another" />',
'label.network.addVM': '<fmt:message key="label.network.addVM" />',
'label.set.default.NIC': '<fmt:message key="label.set.default.NIC" />',
@@ -1260,9 +1252,7 @@ dictionary = {
'label.ipv6.gateway': '<fmt:message key="label.ipv6.gateway" />',
'label.ipv6.CIDR': '<fmt:message key="label.ipv6.CIDR" />',
'label.VPC.limits': '<fmt:message key="label.VPC.limits" />',
-'label.gslb.domain.name': '<fmt:message key="label.gslb.domain.name" />',
'label.edit.region': '<fmt:message key="label.edit.region" />',
-'label.gslb.domain.name': '<fmt:message key="label.gslb.domain.name" />',
'label.add.gslb': '<fmt:message key="label.add.gslb" />',
'label.gslb.servicetype': '<fmt:message key="label.gslb.servicetype" />',
'label.gslb.details': '<fmt:message key="label.gslb.details" />',
@@ -1653,6 +1643,214 @@ dictionary = {
'state.Stopping': '<fmt:message key="state.Stopping" />',
'state.Suspended': '<fmt:message key="state.Suspended" />',
'ui.listView.filters.all': '<fmt:message key="ui.listView.filters.all" />',
-'ui.listView.filters.mine': '<fmt:message key="ui.listView.filters.mine" />'
+'ui.listView.filters.mine': '<fmt:message key="ui.listView.filters.mine" />',
+'label.security.groups': '<fmt:message key="label.security.groups" />',
+'label.opendaylight.controller': '<fmt:message key="label.opendaylight.controller" />',
+'label.resource.name': '<fmt:message key="label.resource.name" />',
+'label.reource.id': '<fmt:message key="label.reource.id" />',
+'label.vnmc.devices': '<fmt:message key="label.vnmc.devices" />',
+'label.add.vnmc.provider': '<fmt:message key="label.add.vnmc.provider" />',
+'label.enable.vnmc.provider': '<fmt:message key="label.enable.vnmc.provider" />',
+'label.add.vnmc.device': '<fmt:message key="label.add.vnmc.device" />',
+'label.ciscovnmc.resource.details': '<fmt:message key="label.ciscovnmc.resource.details" />',
+'label.delete.ciscovnmc.resource': '<fmt:message key="label.delete.ciscovnmc.resource" />',
+'label.enable.vnmc.device': '<fmt:message key="label.enable.vnmc.device" />',
+'label.disbale.vnmc.device': '<fmt:message key="label.disbale.vnmc.device" />',
+'label.disable.vnmc.provider': '<fmt:message key="label.disable.vnmc.provider" />',
+'label.services': '<fmt:message key="label.services" />',
+'label.secondary.staging.store': '<fmt:message key="label.secondary.staging.store" />',
+'label.release.account': '<fmt:message key="label.release.account" />',
+'label.release.account.lowercase': '<fmt:message key="label.release.account.lowercase" />',
+'label.vlan.vni.ranges': '<fmt:message key="label.vlan.vni.ranges" />',
+'label.dedicated.vlan.vni.ranges': '<fmt:message key="label.dedicated.vlan.vni.ranges" />',
+'label.dedicate.vlan.vni.range': '<fmt:message key="label.dedicate.vlan.vni.range" />',
+'label.vlan.vni.range': '<fmt:message key="label.vlan.vni.range" />',
+'label.vlan.range.details': '<fmt:message key="label.vlan.range.details" />',
+'label.broadcat.uri': '<fmt:message key="label.broadcat.uri" />',
+'label.ipv4.cidr': '<fmt:message key="label.ipv4.cidr" />',
+'label.guest.network.details': '<fmt:message key="label.guest.network.details" />',
+'label.ipv4.gateway': '<fmt:message key="label.ipv4.gateway" />',
+'label.vlan.ranges': '<fmt:message key="label.vlan.ranges" />',
+'label.virtual.appliance.details': '<fmt:message key="label.virtual.appliance.details" />',
+'label.start.lb.vm': '<fmt:message key="label.start.lb.vm" />',
+'label.stop.lb.vm': '<fmt:message key="label.stop.lb.vm" />',
+'label.migrate.lb.vm': '<fmt:message key="label.migrate.lb.vm" />',
+'label.vpc.virtual.router': '<fmt:message key="label.vpc.virtual.router" />',
+'label.ovs': '<fmt:message key="label.ovs" />',
+'label.gslb.service': '<fmt:message key="label.gslb.service" />',
+'label.gslb.service.public.ip': '<fmt:message key="label.gslb.service.public.ip" />',
+'label.gslb.service.private.ip': '<fmt:message key="label.gslb.service.private.ip" />',
+'label.baremetal.dhcp.provider': '<fmt:message key="label.baremetal.dhcp.provider" />',
+'label.add.baremetal.dhcp.device': '<fmt:message key="label.add.baremetal.dhcp.device" />',
+'label.baremetal.pxe.provider': '<fmt:message key="label.baremetal.pxe.provider" />',
+'label.baremetal.pxe.device': '<fmt:message key="label.baremetal.pxe.device" />',
+'label.tftp.root.directory': '<fmt:message key="label.tftp.root.directory" />',
+'label.add.vmware.datacenter': '<fmt:message key="label.add.vmware.datacenter" />',
+'label.remove.vmware.datacenter': '<fmt:message key="label.remove.vmware.datacenter" />',
+'label.dc.name': '<fmt:message key="label.dc.name" />',
+'label.vcenter': '<fmt:message key="label.vcenter" />',
+'label.dedicate.zone': '<fmt:message key="label.dedicate.zone" />',
+'label.zone.dedicated': '<fmt:message key="label.zone.dedicated" />',
+'label.release.dedicated.zone': '<fmt:message key="label.release.dedicated.zone" />',
+'label.ipv6.dns1': '<fmt:message key="label.ipv6.dns1" />',
+'label.ipv6.dns2': '<fmt:message key="label.ipv6.dns2" />',
+'label.vmware.datacenter.name': '<fmt:message key="label.vmware.datacenter.name" />',
+'label.vmware.datacenter.vcenter': '<fmt:message key="label.vmware.datacenter.vcenter" />',
+'label.vmware.datacenter.id': '<fmt:message key="label.vmware.datacenter.id" />',
+'label.system.vm.details': '<fmt:message key="label.system.vm.details" />',
+'label.system.vm.scaled.up': '<fmt:message key="label.system.vm.scaled.up" />',
+'label.console.proxy.vm': '<fmt:message key="label.console.proxy.vm" />',
+'label.settings': '<fmt:message key="label.settings" />',
+'label.requires.upgrade': '<fmt:message key="label.requires.upgrade" />',
+'label.upgrade.router.newer.template': '<fmt:message key="label.upgrade.router.newer.template" />',
+'label.router.vm.scaled.up': '<fmt:message key="label.router.vm.scaled.up" />',
+'label.total.virtual.routers': '<fmt:message key="label.total.virtual.routers" />',
+'label.upgrade.required': '<fmt:message key="label.upgrade.required" />',
+'label.virtual.routers.group.zone': '<fmt:message key="label.virtual.routers.group.zone" />',
+'label.total.virtual.routers.upgrade': '<fmt:message key="label.total.virtual.routers.upgrade" />',
+'label.virtual.routers.group.pod': '<fmt:message key="label.virtual.routers.group.pod" />',
+'label.virtual.routers.group.cluster': '<fmt:message key="label.virtual.routers.group.cluster" />',
+'label.zone.lower': '<fmt:message key="label.zone.lower" />',
+'label.virtual.routers.group.account': '<fmt:message key="label.virtual.routers.group.account" />',
+'label.netscaler.details': '<fmt:message key="label.netscaler.details" />',
+'label.baremetal.dhcp.devices': '<fmt:message key="label.baremetal.dhcp.devices" />',
+'label.baremetal.pxe.devices': '<fmt:message key="label.baremetal.pxe.devices" />',
+'label.addes.new.f5': '<fmt:message key="label.addes.new.f5" />',
+'label.f5.details': '<fmt:message key="label.f5.details" />',
+'label.srx.details': '<fmt:message key="label.srx.details" />',
+'label.palo.alto.details': '<fmt:message key="label.palo.alto.details" />',
+'label.added.nicira.nvp.controller': '<fmt:message key="label.added.nicira.nvp.controller" />',
+'label.nicira.nvp.details': '<fmt:message key="label.nicira.nvp.details" />',
+'label.added.new.bigswitch.vns.controller': '<fmt:message key="label.added.new.bigswitch.vns.controller" />',
+'label.bigswitch.vns.details': '<fmt:message key="label.bigswitch.vns.details" />',
+'label.dedicate': '<fmt:message key="label.dedicate" />',
+'label.dedicate.pod': '<fmt:message key="label.dedicate.pod" />',
+'label.pod.dedicated': '<fmt:message key="label.pod.dedicated" />',
+'label.release.dedicated.pod': '<fmt:message key="label.release.dedicated.pod" />',
+'label.override.public.traffic': '<fmt:message key="label.override.public.traffic" />',
+'label.public.traffic.vswitch.type': '<fmt:message key="label.public.traffic.vswitch.type" />',
+'label.public.traffic.vswitch.name': '<fmt:message key="label.public.traffic.vswitch.name" />',
+'label.override.guest.traffic': '<fmt:message key="label.override.guest.traffic" />',
+'label.guest.traffic.vswitch.type': '<fmt:message key="label.guest.traffic.vswitch.type" />',
+'label.guest.traffic.vswitch.name': '<fmt:message key="label.guest.traffic.vswitch.name" />',
+'label.cisco.nexus1000v.ip.address': '<fmt:message key="label.cisco.nexus1000v.ip.address" />',
+'label.cisco.nexus1000v.username': '<fmt:message key="label.cisco.nexus1000v.username" />',
+'label.cisco.nexus1000v.password': '<fmt:message key="label.cisco.nexus1000v.password" />',
+'label.dedicate.cluster': '<fmt:message key="label.dedicate.cluster" />',
+'label.release.dedicated.cluster': '<fmt:message key="label.release.dedicated.cluster" />',
+'label.dedicate.host': '<fmt:message key="label.dedicate.host" />',
+'label.release.dedicated.host': '<fmt:message key="label.release.dedicated.host" />',
+'label.number.of.cpu.sockets': '<fmt:message key="label.number.of.cpu.sockets" />',
+'label.delete.ucs.manager': '<fmt:message key="label.delete.ucs.manager" />',
+'label.blades': '<fmt:message key="label.blades" />',
+'label.chassis': '<fmt:message key="label.chassis" />',
+'label.blade.id': '<fmt:message key="label.blade.id" />',
+'label.associated.profile': '<fmt:message key="label.associated.profile" />',
+'label.refresh.blades': '<fmt:message key="label.refresh.blades" />',
+'label.instanciate.template.associate.profile.blade': '<fmt:message key="label.instanciate.template.associate.profile.blade" />',
+'label.select.template': '<fmt:message key="label.select.template" />',
+'label.profile': '<fmt:message key="label.profile" />',
+'label.delete.profile': '<fmt:message key="label.delete.profile" />',
+'label.disassociate.profile.blade': '<fmt:message key="label.disassociate.profile.blade" />',
+'label.secondary.storage.details': '<fmt:message key="label.secondary.storage.details" />',
+'label.secondary.staging.store.details': '<fmt:message key="label.secondary.staging.store.details" />',
+'label.add.nfs.secondary.staging.store': '<fmt:message key="label.add.nfs.secondary.staging.store" />',
+'label.delete.secondary.staging.store': '<fmt:message key="label.delete.secondary.staging.store" />',
+'label.ipv4.start.ip': '<fmt:message key="label.ipv4.start.ip" />',
+'label.ipv4.end.ip': '<fmt:message key="label.ipv4.end.ip" />',
+'label.ipv6.start.ip': '<fmt:message key="label.ipv6.start.ip" />',
+'label.ipv6.end.ip': '<fmt:message key="label.ipv6.end.ip" />',
+'label.vm.password': '<fmt:message key="label.vm.password" />',
+'label.group.by.zone': '<fmt:message key="label.group.by.zone" />',
+'label.group.by.pod': '<fmt:message key="label.group.by.pod" />',
+'label.group.by.cluster': '<fmt:message key="label.group.by.cluster" />',
+'label.group.by.account': '<fmt:message key="label.group.by.account" />',
+'label.no.grouping': '<fmt:message key="label.no.grouping" />',
+'label.create.nfs.secondary.staging.storage': '<fmt:message key="label.create.nfs.secondary.staging.storage" />',
+'label.username.lower': '<fmt:message key="label.username.lower" />',
+'label.password.lower': '<fmt:message key="label.password.lower" />',
+'label.email.lower': '<fmt:message key="label.email.lower" />',
+'label.firstname.lower': '<fmt:message key="label.firstname.lower" />',
+'label.lastname.lower': '<fmt:message key="label.lastname.lower" />',
+'label.domain.lower': '<fmt:message key="label.domain.lower" />',
+'label.account.lower': '<fmt:message key="label.account.lower" />',
+'label.type.lower': '<fmt:message key="label.type.lower" />',
+'label.rule.number': '<fmt:message key="label.rule.number" />',
+'label.action': '<fmt:message key="label.action" />',
+'label.name.lower': '<fmt:message key="label.name.lower" />',
+'label.ucs': '<fmt:message key="label.ucs" />',
+'label.change.affinity': '<fmt:message key="label.change.affinity" />',
+'label.persistent': '<fmt:message key="label.persistent" />',
+'label.broadcasturi': '<fmt:message key="label.broadcasturi" />',
+'label.network.cidr': '<fmt:message key="label.network.cidr" />',
+'label.reserved.ip.range': '<fmt:message key="label.reserved.ip.range" />',
+'label.autoscale': '<fmt:message key="label.autoscale" />',
+'label.health.check': '<fmt:message key="label.health.check" />',
+'label.public.load.balancer.provider': '<fmt:message key="label.public.load.balancer.provider" />',
+'label.add.isolated.network': '<fmt:message key="label.add.isolated.network" />',
+'label.vlan': '<fmt:message key="label.vlan" />',
+'label.secondary.isolated.vlan.id': '<fmt:message key="label.secondary.isolated.vlan.id" />',
+'label.ipv4.netmask': '<fmt:message key="label.ipv4.netmask" />',
+'label.custom': '<fmt:message key="label.custom" />',
+'label.disable.network.offering': '<fmt:message key="label.disable.network.offering" />',
+'label.enable.network.offering': '<fmt:message key="label.enable.network.offering" />',
+'label.remove.network.offering': '<fmt:message key="label.remove.network.offering" />',
+'label.system.offering.for.router': '<fmt:message key="label.system.offering.for.router" />',
+'label.mode': '<fmt:message key="label.mode" />',
+'label.associate.public.ip': '<fmt:message key="label.associate.public.ip" />',
+'label.acl': '<fmt:message key="label.acl" />',
+'label.user.data': '<fmt:message key="label.user.data" />',
+'label.virtual.networking': '<fmt:message key="label.virtual.networking" />',
+'label.allow': '<fmt:message key="label.allow" />',
+'label.deny': '<fmt:message key="label.deny" />',
+'label.default.egress.policy': '<fmt:message key="label.default.egress.policy" />',
+'label.xenserver.tools.version.61.plus': '<fmt:message key="label.xenserver.tools.version.61.plus" />',
+'message.confirm.delete.ciscovnmc.resource': '<fmt:message key="message.confirm.delete.ciscovnmc.resource" />',
+'message.confirm.add.vnmc.provider': '<fmt:message key="message.confirm.add.vnmc.provider" />',
+'message.confirm.enable.vnmc.provider': '<fmt:message key="message.confirm.enable.vnmc.provider" />',
+'message.confirm.disable.vnmc.provider': '<fmt:message key="message.confirm.disable.vnmc.provider" />',
+'message.vnmc.available.list': '<fmt:message key="message.vnmc.available.list" />',
+'message.vnmc.not.available.list': '<fmt:message key="message.vnmc.not.available.list" />',
+'message.confirm.release.dedicate.vlan.range': '<fmt:message key="message.confirm.release.dedicate.vlan.range" />',
+'message.confirm.start.lb.vm': '<fmt:message key="message.confirm.start.lb.vm" />',
+'message.confirm.stop.lb.vm': '<fmt:message key="message.confirm.stop.lb.vm" />',
+'message.confirm.remove.vmware.datacenter': '<fmt:message key="message.confirm.remove.vmware.datacenter" />',
+'message.confirm.dedicate.zone': '<fmt:message key="message.confirm.dedicate.zone" />',
+'message.confirm.release.dedicated.zone': '<fmt:message key="message.confirm.release.dedicated.zone" />',
+'message.dedicated.zone.released': '<fmt:message key="message.dedicated.zone.released" />',
+'message.read.admin.guide.scaling.up': '<fmt:message key="message.read.admin.guide.scaling.up" />',
+'message.confirm.scale.up.system.vm': '<fmt:message key="message.confirm.scale.up.system.vm" />',
+'message.confirm.upgrade.router.newer.template': '<fmt:message key="message.confirm.upgrade.router.newer.template" />',
+'message.confirm.scale.up.router.vm': '<fmt:message key="message.confirm.scale.up.router.vm" />',
+'message.confirm.upgrade.routers.newtemplate': '<fmt:message key="message.confirm.upgrade.routers.newtemplate" />',
+'message.confirm.upgrade.routers.pod.newtemplate': '<fmt:message key="message.confirm.upgrade.routers.pod.newtemplate" />',
+'message.confirm.upgrade.routers.cluster.newtemplate': '<fmt:message key="message.confirm.upgrade.routers.cluster.newtemplate" />',
+'message.confirm.upgrade.routers.account.newtemplate': '<fmt:message key="message.confirm.upgrade.routers.account.newtemplate" />',
+'message.confirm.dedicate.pod.domain.account': '<fmt:message key="message.confirm.dedicate.pod.domain.account" />',
+'message.confirm.release.dedicated.pod': '<fmt:message key="message.confirm.release.dedicated.pod" />',
+'message.pod.dedication.released': '<fmt:message key="message.pod.dedication.released" />',
+'message.confirm.dedicate.cluster.domain.account': '<fmt:message key="message.confirm.dedicate.cluster.domain.account" />',
+'message.cluster.dedicated': '<fmt:message key="message.cluster.dedicated" />',
+'message.confirm.release.dedicated.cluster': '<fmt:message key="message.confirm.release.dedicated.cluster" />',
+'message.cluster.dedication.released': '<fmt:message key="message.cluster.dedication.released" />',
+'message.confirm.dedicate.host.domain.account': '<fmt:message key="message.confirm.dedicate.host.domain.account" />',
+'message.host.dedicated': '<fmt:message key="message.host.dedicated" />',
+'message.confirm.release.dedicated.host': '<fmt:message key="message.confirm.release.dedicated.host" />',
+'message.host.dedication.released': '<fmt:message key="message.host.dedication.released" />',
+'message.confirm.delete.ucs.manager': '<fmt:message key="message.confirm.delete.ucs.manager" />',
+'message.confirm.refresh.blades': '<fmt:message key="message.confirm.refresh.blades" />',
+'message.confirm.delete.secondary.staging.store': '<fmt:message key="message.confirm.delete.secondary.staging.store" />',
+'message.select.tier': '<fmt:message key="message.select.tier" />',
+'message.disallowed.characters': '<fmt:message key="message.disallowed.characters" />',
+'message.waiting.for.builtin.templates.to.load': '<fmt:message key="message.waiting.for.builtin.templates.to.load" />',
+'message.systems.vms.ready': '<fmt:message key="message.systems.vms.ready" />',
+'message.your.cloudstack.is.ready': '<fmt:message key="message.your.cloudstack.is.ready" />',
+'message.specifiy.tag.key.value': '<fmt:message key="message.specifiy.tag.key.value" />',
+'message.enter.seperated.list.multiple.cidrs': '<fmt:message key="message.enter.seperated.list.multiple.cidrs" />',
+'message.disabling.network.offering': '<fmt:message key="message.disabling.network.offering" />',
+'message.confirm.enable.network.offering': '<fmt:message key="message.confirm.enable.network.offering" />',
+'message.enabling.network.offering': '<fmt:message key="message.enabling.network.offering" />',
+'message.confirm.remove.network.offering': '<fmt:message key="message.confirm.remove.network.offering" />',
+'message.confirm.disable.network.offering': '<fmt:message key="message.confirm.disable.network.offering" />',
};
</script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
----------------------------------------------------------------------
diff --git a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
index d618b23..c9295a3 100644
--- a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
+++ b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
@@ -17,7 +17,7 @@
(function ($, cloudStack) {
cloudStack.modules.vnmcNetworkProvider = function (module) {
var vnmcDeviceViewAll = window._m = [{
- label: 'VNMC Devices',
+ label: 'label.vnmc.devices',
path: '_zone.vnmcDevices'
}];
@@ -25,10 +25,10 @@
id: 'vnmcDevices',
fields: {
resourcename: {
- label: 'Resource Name'
+ label: 'label.resource.name'
},
provider: {
- label: 'Provider'
+ label: 'label.provider'
}
},
dataProvider: function (args) {
@@ -47,16 +47,16 @@
},
actions: {
add: {
- label: 'Add VNMC device',
+ label: 'label.add.vnmc.device',
messages: {
notification: function (args) {
- return 'Add VNMC device';
+ return 'label.add.vnmc.device';
}
},
createForm: {
- title: 'Add VNMC device',
+ title: 'label.add.vnmc.device',
fields: {
hostname: {
label: 'label.host',
@@ -203,16 +203,16 @@
},
detailView: {
- name: 'CiscoVNMC resource details',
+ name: 'label.ciscovnmc.resource.details',
actions: {
remove: {
- label: 'delete CiscoVNMC resource',
+ label: 'label.delete.ciscovnmc.resource',
messages: {
confirm: function (args) {
- return 'Please confirm you want to delete CiscoVNMC resource';
+ return 'message.confirm.delete.ciscovnmc.resource';
},
notification: function (args) {
- return 'delete CiscoVNMC resource';
+ return 'label.delete.ciscovnmc.resource';
}
},
action: function (args) {
@@ -242,14 +242,14 @@
title: 'label.details',
fields: [{
resourcename: {
- label: 'Resource Name'
+ label: 'label.resource.name'
}
}, {
resourceid: {
- label: 'Resource ID'
+ label: 'label.reource.id'
},
provider: {
- label: 'Provider'
+ label: 'label.provider'
}
}],
dataProvider: function (args) {
@@ -277,14 +277,14 @@
viewAll: vnmcDeviceViewAll,
actions: {
add: {
- label: 'Add VNMC provider',
+ label: 'label.add.vnmc.provider',
messages: {
confirm: function (args) {
- return 'Please confirm you would like to add the VNMC provider.';
+ return 'message.confirm.add.vnmc.provider';
},
notification: function (args) {
- return 'Add VNMC device';
+ return 'label.add.vnmc.device';
}
},
@@ -327,14 +327,14 @@
}
},
enable: {
- label: 'Enable VNMC provider',
+ label: 'label.enable.vnmc.provider',
messages: {
confirm: function (args) {
- return 'Please confirm you would like to enable the VNMC provider.';
+ return 'message.confirm.enable.vnmc.provider';
},
notification: function (args) {
- return 'Enable VNMC device';
+ return 'label.enable.vnmc.device';
}
},
@@ -352,7 +352,7 @@
enableCiscoVnmcProviderFn(ciscoVnmcProvider);
} else {
- args.response.error('VNMC is not available from provider list.');
+ args.response.error('message.vnmc.available.list');
}
}
});
@@ -419,14 +419,14 @@
},
disable: {
- label: 'Disable VNMC provider',
+ label: 'label.disable.vnmc.provider',
messages: {
confirm: function (args) {
- return 'Please confirm you would like to disable the VNMC provider.';
+ return 'message.confirm.disable.vnmc.provider';
},
notification: function (args) {
- return 'Disable VNMC device';
+ return 'label.disbale.vnmc.device';
}
},
@@ -444,7 +444,7 @@
disableCiscoVnmcProviderFn(ciscoVnmcProvider);
} else {
- args.response.error('VNMC is not available from provider list.');
+ args.response.error('message.vnmc.not.available.list');
}
}
});
@@ -525,7 +525,7 @@
label: 'label.id'
},
servicelist: {
- label: 'Services',
+ label: 'label.services',
converter: function (args) {
if (args)
return args.join(', ');
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index cb54c31..401262c 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -96,7 +96,7 @@
}
},
isCustomized: {
- label: 'Custom',
+ label: 'label.custom',
isBoolean: true,
isReverse: true,
isChecked: false
@@ -2320,34 +2320,34 @@
// Sanitize names
switch (serviceName) {
case 'Vpn':
- serviceDisplayName = 'VPN';
+ serviceDisplayName = dictionary['label.vpn'];
break;
case 'Dhcp':
serviceDisplayName = dictionary['label.dhcp'];
break;
case 'Dns':
- serviceDisplayName = 'DNS';
+ serviceDisplayName = dictionary['label.dns'];
break;
case 'Lb':
- serviceDisplayName = 'Load Balancer';
+ serviceDisplayName = dictionary['label.load.balancer'];
break;
case 'SourceNat':
- serviceDisplayName = 'Source NAT';
+ serviceDisplayName = dictionary['label.source.nat'];
break;
case 'StaticNat':
- serviceDisplayName = 'Static NAT';
+ serviceDisplayName = dictionary['label.static.nat'];
break;
case 'PortForwarding':
- serviceDisplayName = 'Port Forwarding';
+ serviceDisplayName = dictionary['label.port.forwarding'];
break;
case 'SecurityGroup':
- serviceDisplayName = 'Security Groups';
+ serviceDisplayName = dictionary['label.security.groups'];
break;
case 'UserData':
- serviceDisplayName = 'User Data';
+ serviceDisplayName = dictionary['label.user.data'];
break;
case 'Connectivity':
- serviceDisplayName = 'Virtual Networking';
+ serviceDisplayName = dictionary['label.virtual.networking'];
break;
default:
serviceDisplayName = serviceName;
@@ -2454,7 +2454,7 @@
//show or hide upon checked services and selected providers above (begin)
serviceofferingid: {
- label: 'System Offering for Router',
+ label: 'label.system.offering.for.router',
isHidden: true,
docID: 'helpNetworkOfferingSystemOffering',
select: function(args) {
@@ -2488,7 +2488,7 @@
},
"service.SourceNat.redundantRouterCapabilityCheckbox": {
- label: "label.redundant.router.capability",
+ label: 'label.redundant.router.capability',
isHidden: true,
dependsOn: 'service.SourceNat.isEnabled',
docID: 'helpNetworkOfferingRedundantRouterCapability',
@@ -2534,7 +2534,7 @@
}
},
"service.Lb.inlineModeDropdown": {
- label: 'Mode',
+ label: 'label.mode',
docID: 'helpNetworkOfferingMode',
select: function(args) {
var items = [];
@@ -2559,7 +2559,7 @@
},
"service.StaticNat.associatePublicIP": {
- label: 'Associate Public IP',
+ label: 'label.associate.public.ip',
docID: 'helpNetworkOfferingAssociatePublicIP',
isBoolean: true,
isHidden: true
@@ -2585,23 +2585,23 @@
args.response.success({
data: [{
id: 'Optional',
- description: 'Optional'
+ description: 'label.optional'
}, {
id: 'Required',
- description: 'Required'
+ description: 'label.required'
}]
});
}
},
egresspolicy: {
- label: 'Default egress policy',
+ label: 'label.default.egress.policy',
isHidden: true,
select: function(args) {
args.response.success({
data: [
- { id: 'ALLOW', description: 'Allow' },
- { id: 'DENY', description: 'Deny' }
+ { id: 'ALLOW', description: 'label.allow' },
+ { id: 'DENY', description: 'label.deny' }
]
});
}
@@ -2829,13 +2829,13 @@
},
enable: {
- label: 'Enable network offering',
+ label: 'label.enable.network.offering',
messages: {
confirm: function(args) {
- return 'Are you sure you want to enable this network offering?';
+ return 'message.confirm.enable.network.offering';
},
notification: function(args) {
- return 'Enabling network offering';
+ return 'message.enabling.network.offering';
}
},
action: function(args) {
@@ -2864,13 +2864,13 @@
},
disable: {
- label: 'Disable network offering',
+ label: 'label.disable.network.offering',
messages: {
confirm: function(args) {
- return 'Are you sure you want to disable this network offering?';
+ return 'message.confirm.disable.network.offering';
},
notification: function(args) {
- return 'Disabling network offering';
+ return 'message.disabling.network.offering';
}
},
action: function(args) {
@@ -2899,7 +2899,7 @@
},
remove: {
- label: 'Remove network offering',
+ label: 'label.remove.network.offering',
action: function(args) {
$.ajax({
url: createURL('deleteNetworkOffering'),
@@ -2919,10 +2919,10 @@
},
messages: {
confirm: function() {
- return 'Are you sure you want to remove this network offering?';
+ return 'message.confirm.remove.network.offering';
},
notification: function() {
- return 'Remove network offering';
+ return 'label.remove.network.offering';
}
},
notification: {
@@ -2968,7 +2968,7 @@
},
ispersistent: {
- label: 'Persistent ',
+ label: 'label.persistent ',
converter: cloudStack.converters.toBooleanText
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/scripts/installWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index 25de4aa..85eaff0 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -314,7 +314,7 @@
return vm.state == 'Running';
}).length) {
clearInterval(poll);
- message('System VMs ready.');
+ message('message.systems.vms.ready');
setTimeout(pollBuiltinTemplates, 500);
}
}
@@ -325,7 +325,7 @@
// Wait for builtin template to be present -- otherwise VMs cannot launch
var pollBuiltinTemplates = function() {
- message('Waiting for builtin templates to load...');
+ message('message.waiting.for.builtin.templates.to.load');
var poll = setInterval(function() {
$.ajax({
url: createURL('listTemplates'),
@@ -341,7 +341,7 @@
if (builtinTemplates.length) {
clearInterval(poll);
- message('Your CloudStack is ready!');
+ message('message.your.cloudstack.is.ready');
setTimeout(success, 1000);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 53c9e98..e5b2e85 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -172,10 +172,10 @@
advSearchFields: {
name: {
- label: 'Name'
+ label: 'label.name'
},
zoneid: {
- label: 'Zone',
+ label: 'label.zone',
select: function(args) {
$.ajax({
url: createURL('listZones'),
@@ -199,7 +199,7 @@
},
domainid: {
- label: 'Domain',
+ label: 'label.domain',
select: function(args) {
if (isAdmin() || isDomainAdmin()) {
$.ajax({
@@ -241,7 +241,7 @@
}
},
account: {
- label: 'Account',
+ label: 'label.account',
isHidden: function(args) {
if (isAdmin() || isDomainAdmin())
return false;
@@ -251,10 +251,10 @@
},
tagKey: {
- label: 'Tag Key'
+ label: 'label.tag.key'
},
tagValue: {
- label: 'Tag Value'
+ label: 'label.tag.value'
}
},
@@ -464,7 +464,7 @@
},
complete: function(args) {
if (args.password != null) {
- return 'Password of the VM is ' + args.password;
+ return 'label.vm.password' + ' ' + args.password;
}
return false;
@@ -478,7 +478,7 @@
label: 'label.action.stop.instance',
compactLabel: 'label.stop',
createForm: {
- title: 'Stop instance',
+ title: 'notification.stop.instance',
desc: 'message.action.stop.instance',
fields: {
forced: {
@@ -764,7 +764,7 @@
var networks = json.listnetworksresponse.network;
var items = [{
id: -1,
- description: 'Please select a tier'
+ description: 'message.select.tier'
}];
$(networks).each(function() {
items.push({
@@ -1434,7 +1434,7 @@
var description = '';
var vmObj = args.jsonObj;
if (vmObj.state == 'Running' && vmObj.hypervisor == 'VMware') {
- description = 'Please read the dynamic scaling section in the admin guide before scaling up.';
+ description = 'message.read.admin.guide.scaling.up';
}
return description;
},
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 6ce66e8..f82a295 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -410,7 +410,7 @@
listView: {
actions: {
add: {
- label: 'Add Isolated Network',
+ label: 'label.add.isolated.network',
preFilter: function(args) {
if (advZoneObjs != null && advZoneObjs.length > 0) {
@@ -766,13 +766,13 @@
label: 'label.cidr'
},
ip6cidr: {
- label: 'IPv6 CIDR'
+ label: 'label.ipv6.CIDR'
}
},
advSearchFields: {
zoneid: {
- label: 'Zone',
+ label: 'label.zone',
select: function(args) {
$.ajax({
url: createURL('listZones'),
@@ -796,7 +796,7 @@
},
domainid: {
- label: 'Domain',
+ label: 'label.domain',
select: function(args) {
if (isAdmin() || isDomainAdmin()) {
$.ajax({
@@ -839,7 +839,7 @@
},
account: {
- label: 'Account',
+ label: 'label.account',
isHidden: function(args) {
if (isAdmin() || isDomainAdmin())
return false;
@@ -848,10 +848,10 @@
}
},
tagKey: {
- label: 'Tag Key'
+ label: 'label.tag.key'
},
tagValue: {
- label: 'Tag Value'
+ label: 'label.tag.value'
}
},
@@ -875,7 +875,7 @@
},
detailView: {
- name: 'Guest network details',
+ name: 'label.guest.network.details',
viewAll: {
path: 'network.ipAddresses',
label: 'label.menu.ipaddresses',
@@ -1245,7 +1245,7 @@
},
ispersistent: {
- label: 'Persistent ',
+ label: 'label.persistent',
converter: cloudStack.converters.toBooleanText
},
@@ -1263,7 +1263,7 @@
},
broadcasturi: {
- label: 'broadcasturi'
+ label: 'label.broadcasturi'
},
networkofferingid: {
@@ -1323,20 +1323,20 @@
},
networkcidr: {
- label: 'Network CIDR'
+ label: 'label.network.cidr'
},
ip6gateway: {
- label: 'IPv6 Gateway'
+ label: 'label.ipv6.gateway'
},
ip6cidr: {
- label: 'IPv6 CIDR'
+ label: 'label.ipv6.CIDR'
},
reservediprange: {
- label: 'Reserved IP Range'
+ label: 'label.reserved.ip.range'
},
@@ -1688,7 +1688,7 @@
}
},
'autoScale': {
- label: 'AutoScale',
+ label: 'label.autoscale',
custom: {
requireValidation: true,
buttonLabel: 'label.configure',
@@ -2785,7 +2785,7 @@
label: 'label.zone'
},
vlanname: {
- label: 'label.vlan'
+ label: 'label.vlan.only'
}
}],
@@ -3479,7 +3479,7 @@
},
'health-check': {
- label: 'Health Check',
+ label: 'label.health.check',
custom: {
requireValidation: true,
buttonLabel: 'Configure',
@@ -3489,7 +3489,7 @@
},
'autoScale': {
- label: 'AutoScale',
+ label: 'label.autoscale',
custom: {
requireValidation: true,
buttonLabel: 'label.configure',
@@ -4475,10 +4475,10 @@
advSearchFields: {
tagKey: {
- label: 'Tag Key'
+ label: 'label.tag.key'
},
tagValue: {
- label: 'Tag Value'
+ label: 'label.tag.value'
}
},
@@ -5013,10 +5013,10 @@
advSearchFields: {
name: {
- label: 'Name'
+ label: 'label.name'
},
zoneid: {
- label: 'Zone',
+ label: 'label.zone',
select: function(args) {
$.ajax({
url: createURL('listZones'),
@@ -5040,7 +5040,7 @@
},
domainid: {
- label: 'Domain',
+ label: 'label.domain',
select: function(args) {
if (isAdmin() || isDomainAdmin()) {
$.ajax({
@@ -5083,7 +5083,7 @@
},
account: {
- label: 'Account',
+ label: 'label.account',
isHidden: function(args) {
if (isAdmin() || isDomainAdmin())
return false;
@@ -5092,10 +5092,10 @@
}
},
tagKey: {
- label: 'Tag Key'
+ label: 'label.tag.key'
},
tagValue: {
- label: 'Tag Value'
+ label: 'label.tag.value'
}
},
@@ -5186,7 +5186,7 @@
label: 'label.DNS.domain.for.guest.networks'
},
publicLoadBalancerProvider: {
- label: 'Public Load Balancer Provider',
+ label: 'label.public.load.balancer.provider',
select: function(args) {
var items = [];
items.push({
@@ -5429,7 +5429,7 @@
label: 'label.state'
},
ispersistent: {
- label: 'Persistent ',
+ label: 'label.persistent',
converter: cloudStack.converters.toBooleanText
},
@@ -5604,8 +5604,8 @@
}
},
cidrlist: {
- label: 'CIDR list',
- desc: 'Please enter a comma separated list of CIDRs if more than one',
+ label: 'label.CIDR.list',
+ desc: 'message.enter.seperated.list.multiple.cidrs',
validation: {
required: true
}
@@ -5619,7 +5619,7 @@
},
cidrlist: {
label: 'label.CIDR.list',
- desc: 'Please enter a comma separated list of CIDRs if more than one',
+ desc: 'message.enter.seperated.list.multiple.cidrs',
docID: 'helpVPNGatewayCIDRList',
validation: {
required: true
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index f0afea5..9c24f40 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -297,7 +297,7 @@ var addGuestNetworkDialog = {
docID: 'helpGuestNetworkZoneVLANID'
},
isolatedpvlanId: {
- label: 'Secondary Isolated VLAN ID'
+ label: 'label.secondary.isolated.vlan.id'
},
scope: {
@@ -319,24 +319,24 @@ var addGuestNetworkDialog = {
if (selectedZoneObj.networktype == "Advanced" && selectedZoneObj.securitygroupsenabled == true) {
array1.push({
id: 'zone-wide',
- description: 'All'
+ description: 'ui.listView.filters.all'
});
} else {
array1.push({
id: 'zone-wide',
- description: 'All'
+ description: 'ui.listView.filters.all'
});
array1.push({
id: 'domain-specific',
- description: 'Domain'
+ description: 'label.domain'
});
array1.push({
id: 'account-specific',
- description: 'Account'
+ description: 'label.account'
});
array1.push({
id: 'project-specific',
- description: 'Project'
+ description: 'label.project'
});
}
args.response.success({
@@ -584,37 +584,37 @@ var addGuestNetworkDialog = {
//IPv4 (begin)
ip4gateway: {
- label: 'IPv4 Gateway',
+ label: 'label.ipv4.gateway',
docID: 'helpGuestNetworkZoneGateway'
},
ip4Netmask: {
- label: 'IPv4 Netmask',
+ label: 'label.ipv4.netmask',
docID: 'helpGuestNetworkZoneNetmask'
},
startipv4: {
- label: 'IPv4 Start IP',
+ label: 'label.ipv4.start.ip',
docID: 'helpGuestNetworkZoneStartIP'
},
endipv4: {
- label: 'IPv4 End IP',
+ label: 'label.ipv4.end.ip',
docID: 'helpGuestNetworkZoneEndIP'
},
//IPv4 (end)
//IPv6 (begin)
ip6gateway: {
- label: 'IPv6 Gateway',
+ label: 'label.ipv6.gateway',
docID: 'helpGuestNetworkZoneGateway'
},
ip6cidr: {
- label: 'IPv6 CIDR'
+ label: 'label.ipv6.CIDR'
},
startipv6: {
- label: 'IPv6 Start IP',
+ label: 'label.ipv6.start.ip',
docID: 'helpGuestNetworkZoneStartIP'
},
endipv6: {
- label: 'IPv6 End IP',
+ label: 'label.ipv6.end.ip',
docID: 'helpGuestNetworkZoneEndIP'
},
//IPv6 (end)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/182c3189/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 1cd8d2e..e69a07e 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1093,11 +1093,11 @@
isBoolean: true
},
isFeatured: {
- label: "label.featured",
+ label: 'label.featured',
isBoolean: true
},
isdynamicallyscalable: {
- label: "Dynamically Scalable",
+ label: 'label.dynamically.scalable',
isBoolean: true
}
}
@@ -1688,7 +1688,7 @@
isBoolean: true
},
isdynamicallyscalable: {
- label: "Dynamically Scalable",
+ label: 'label.dynamically.scalable',
isBoolean: true
}
}