CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"

- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues
This commit is contained in:
Mihaela Stoica 2014-10-01 08:51:37 +01:00 committed by Brian Federle
parent d46251fab6
commit 0646588fc6
7 changed files with 110 additions and 50 deletions

View File

@ -1524,6 +1524,77 @@ label.vgpu.video.ram=Video RAM
label.vgpu.max.resolution=Max resolution
label.vgpu.max.vgpu.per.gpu=vGPUs per GPU
label.vgpu.remaining.capacity=Remaining capacity
label.routing.host=Routing Host
label.usage.server=Usage Server
label.user.vm=User VM
label.resource.limit.exceeded=Resource Limit Exceeded
label.direct.attached.public.ip=Direct Attached Public IP
label.usage.sanity.result=Usage Sanity Result
label.select.region=Select region
label.info.upper=INFO
label.warn.upper=WARN
label.error.upper=ERROR
label.event.deleted=Event Deleted
label.add.ciscoASA1000v=Add CiscoASA1000v Resource
label.delete.ciscoASA1000v=Delete CiscoASA1000v
label.inside.port.profile=Inside Port Profile
label.archive=Archive
label.event.archived=Event Archived
label.alert.details=Alert details
label.alert.deleted=Alert Deleted
label.alert.archived=Alert Archived
label.volume.details=Volume details
label.volume.migrated=Volume migrated
label.storage.pool=Storage Pool
label.enable.host=Enable Host
label.disable.host=Disable Host
label.copying.iso=Copying ISO
label.add.internal.lb=Add Internal LB
label.internal.lb.details=Internal LB details
label.delete.internal.lb=Delete Internal LB
label.remove.vm.load.balancer=Remove VM from load balancer
label.add.acl.list=Add ACL List
label.add.list.name=ACL List Name
label.add.network.acl.list=Add Network ACL List
label.delete.acl.list=Delete ACL List
label.acl.replaced=ACL replaced
label.ipv4.dns1=IPv4 DNS1
label.ipv4.dns2=IPv4 DNS2
label.protocol.number=Protocol Number
label.edit.acl.rule=Edit ACL rule
label.source.ip.address=Source IP Address
label.source.port=Source Port
label.instance.port=Instance Port
label.assigned.vms=Assigned VMs
label.replace.acl=Replace ACL
label.source.nat.supported=SourceNAT Supported
label.acl.name=ACL Name
label.acl.id=ACL ID
label.passive=Passive
label.replace.acl.list=Replace ACL List
label.vswitch.name=vSwitch Name
label.vSwitch.type=vSwitch Type
label.ping.path=Ping Path
label.response.timeout.in.sec=Response Timeout (in sec)
label.health.check.interval.in.sec=Health Check Interval (in sec)
label.healthy.threshold=Healthy Threshold
label.unhealthy.threshold=Unhealthy Threshold
label.other=Other
label.vm.id=VM ID
label.vnmc=VNMC
label.scale.up.policy=SCALE UP POLICY
label.counter=Counter
label.operator=Operator
label.threshold=Threshold
label.load.balancer.type=Load Balancer Type
label.vgpu=VGPU
label.sticky.name=Sticky Name
label.stickiness.method=Stickiness method
label.gslb=GSLB
label.portable.ip=Portable IP
label.internallbvm=InternalLbVm
label.agent.state=Agent State
label.duration.in.sec=Duration(in sec)
managed.state=Managed State
message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network.
@ -1656,6 +1727,25 @@ message.confirm.enable.provider=Please confirm that you would like to enable thi
message.confirm.join.project=Please confirm you wish to join this project.
message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
message.confirm.current.guest.CIDR.unchanged=Do you want to keep the current guest network CIDR unchanged?
message.confirm.delete.ciscoASA1000v=Please confirm you want to delete CiscoASA1000v
message.confirm.remove.selected.events=Please confirm you would like to remove the selected events
message.confirm.archive.selected.events=Please confirm you would like to archive the selected events
message.confirm.remove.event=Are you sure you want to remove this event?
message.confirm.archive.event=Please confirm that you want to archive this event.
message.confirm.remove.selected.alerts=Please confirm you would like to remove the selected alerts
message.confirm.archive.selected.alerts=Please confirm you would like to archive the selected alerts
message.confirm.delete.alert=Are you sure you want to delete this alert ?
message.confirm.archive.alert=Please confirm that you want to archive this alert.
message.confirm.migrate.volume=Do you want to migrate this volume?
message.confirm.attach.disk=Are you sure you want to attach disk?
message.confirm.create.volume=Are you sure you want to create volume?
message.confirm.enable.host=Please confirm that you want to enable the host
message.confirm.disable.host=Please confirm that you want to disable the host
message.confirm.delete.internal.lb=Please confirm you want to delete Internal LB
message.confirm.remove.load.balancer=Please confirm you want to remove VM from load balancer
message.confirm.delete.acl.list=Are you sure you want to delete this ACL list?
message.confirm.replace.acl.new.one=Do you want to replace the ACL with a new one?
message.copy.iso.confirm=Please confirm that you wish to copy your ISO to
message.copy.template=Copy template <b id\="copy_template_name_text">XXX</b> from zone <b id\="copy_template_source_zone_text"></b> to
message.create.template.vm=Create VM from template <b id\="p_name"></b>
@ -1826,6 +1916,8 @@ message.tooltip.zone.name=A name for the zone.
message.update.os.preference=Please choose a OS preference for this host. All virtual instances with similar preferences will be first allocated to this host before choosing another.
message.update.resource.count=Please confirm that you want to update resource counts for this account.
message.update.ssl=Please submit a new X.509 compliant SSL certificate chain to be updated to each console proxy and secondary storage virtual instance\:
message.update.ssl.succeeded=Update SSL Certificates succeeded
message.update.ssl.failed=Failed to update SSL Certificate.
message.validate.instance.name=Instance name can not be longer than 63 characters. Only ASCII letters a~z, A~Z, digits 0~9, hyphen are allowed. Must start with a letter and end with a letter or a digit.
message.virtual.network.desc=A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router.
message.vm.create.template.confirm=Create Template will reboot the VM automatically.
@ -1944,6 +2036,7 @@ state.Completed=Completed
state.Creating=Creating
state.Declined=Declined
state.Destroyed=Destroyed
state.detached=Detached
state.Disabled=Disabled
state.Enabled=Enabled
state.enabled=Enabled

View File

@ -964,7 +964,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.providers': '<fmt:message key="label.providers" />',
'label.provider': '<fmt:message key="label.provider" />',
'label.providers': '<fmt:message key="label.providers" />',
'label.public': '<fmt:message key="label.public" />',

View File

@ -25,21 +25,6 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script type="text/javascript">
dictionary2 = {
'label.resource': '<fmt:message key="label.resource" />',
'label.resource.limits': '<fmt:message key="label.resource.limits" />',
'label.resources': '<fmt:message key="label.resources" />',
'label.resource.state': '<fmt:message key="label.resource.state" />',
'label.restart.network': '<fmt:message key="label.restart.network" />',
'label.restart.required': '<fmt:message key="label.restart.required" />',
'label.restart.vpc': '<fmt:message key="label.restart.vpc" />',
'label.restore': '<fmt:message key="label.restore" />',
'label.retry.interval': '<fmt:message key="label.retry.interval" />',
'label.review': '<fmt:message key="label.review" />',
'label.revoke.project.invite': '<fmt:message key="label.revoke.project.invite" />',
'label.role': '<fmt:message key="label.role" />',
'label.root.disk.controller': '<fmt:message key="label.root.disk.controller" />',
'label.root.disk.offering': '<fmt:message key="label.root.disk.offering" />',
'label.round.robin': '<fmt:message key="label.round.robin" />',
'label.rules': '<fmt:message key="label.rules" />',
'label.running.vms': '<fmt:message key="label.running.vms" />',
'label.s3.access_key': '<fmt:message key="label.s3.access_key" />',
@ -101,7 +86,7 @@ dictionary2 = {
'label.specify.IP.ranges': '<fmt:message key="label.specify.IP.ranges" />',
'label.specify.vlan': '<fmt:message key="label.specify.vlan" />',
'label.specify.vxlan': '<fmt:message key="label.specify.vxlan" />',
'label.SR.name ': '<fmt:message key="label.SR.name " />',
'label.SR.name': '<fmt:message key="label.SR.name" />',
'label.srx': '<fmt:message key="label.srx" />',
'label.PA': '<fmt:message key="label.PA" />',
'label.start.IP': '<fmt:message key="label.start.IP" />',
@ -175,7 +160,7 @@ dictionary2 = {
'label.tier': '<fmt:message key="label.tier" />',
'label.time': '<fmt:message key="label.time" />',
'label.timeout': '<fmt:message key="label.timeout" />',
'label.timeout.in.second ': '<fmt:message key="label.timeout.in.second " />',
'label.timeout.in.second': '<fmt:message key="label.timeout.in.second" />',
'label.time.zone': '<fmt:message key="label.time.zone" />',
'label.timezone': '<fmt:message key="label.timezone" />',
'label.token': '<fmt:message key="label.token" />',
@ -289,7 +274,7 @@ dictionary2 = {
'label.zone.wide': '<fmt:message key="label.zone.wide" />',
'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.openDaylight': '<fmt:message key="label.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" />',
@ -305,18 +290,17 @@ dictionary2 = {
'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" />',
'label.gslb.delete': '<fmt:message key="label.gslb.delete" />',
'message.gslb.delete.confirm': '<fmt:message key="message.gslb.delete.confirm" />',
'label.opendaylight.controllers': '<fmt:message key="OpenDaylight Controllers" />',
'label.opendaylight.controllers': '<fmt:message key="label.opendaylight.controllers" />',
'label.portable.ip.ranges': '<fmt:message key="label.portable.ip.ranges" />',
'label.add.portable.ip.range': '<fmt:message key="label.add.portable.ip.range" />',
'label.delete.portable.ip.range': '<fmt:message key="label.delete.portable.ip.range" />',
'message.portable.ip.delete.confirm': '<fmt:message key="message.portable.ip.delete.confirm" />',
'label.opendaylight.controllerdetail': '<fmt:message key="OpenDaylight Controller Details" />',
'label.opendaylight.controllerdetail': '<fmt:message key="label.opendaylight.controllerdetail" />',
'label.portable.ip.range.details': '<fmt:message key="label.portable.ip.range.details" />',
'label.portable.ips': '<fmt:message key="label.portable.ips" />',
'label.gslb.assigned.lb': '<fmt:message key="label.gslb.assigned.lb" />',
@ -328,18 +312,14 @@ dictionary2 = {
'label.disable.autoscale': '<fmt:message key="label.disable.autoscale" />',
'label.min.instances': '<fmt:message key="label.min.instances" />',
'label.max.instances': '<fmt:message key="label.max.instances" />',
'label.add.OpenDaylight.device': '<fmt:message key="Add OpenDaylight Controller" />',
'label.delete.OpenDaylight.device': '<fmt:message key="Delete OpenDaylight Controller" />',
'label.add.OpenDaylight.device': '<fmt:message key="label.add.OpenDaylight.device" />',
'label.delete.OpenDaylight.device': '<fmt:message key="label.delete.OpenDaylight.device" />',
'label.show.advanced.settings': '<fmt:message key="label.show.advanced.settings" />',
'label.polling.interval.sec': '<fmt:message key="label.polling.interval.sec" />',
'label.quiet.time.sec': '<fmt:message key="label.quiet.time.sec" />',
'label.destroy.vm.graceperiod': '<fmt:message key="label.destroy.vm.graceperiod" />',
'label.SNMP.community': '<fmt:message key="label.SNMP.community" />',
'label.SNMP.port': '<fmt:message key="label.SNMP.port" />',
'label.add.ucs.manager': '<fmt:message key="label.add.ucs.manager" />',
'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" />',
'managed.state': '<fmt:message key="managed.state" />',
'message.gslb.lb.remove.confirm': '<fmt:message key="message.gslb.lb.remove.confirm" />',
'message.admin.guide.read': '<fmt:message key="message.admin.guide.read" />',
@ -699,7 +679,6 @@ dictionary2 = {
'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" />',
'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" />',
@ -726,7 +705,6 @@ dictionary2 = {
'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.release.dedicated.vlan.range': '<fmt:message key="label.release.dedicated.vlan.range" />',
'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" />',
@ -749,8 +727,6 @@ dictionary2 = {
'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" />',
@ -838,7 +814,6 @@ dictionary2 = {
'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" />',
@ -847,7 +822,6 @@ dictionary2 = {
'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" />',
@ -870,7 +844,6 @@ dictionary2 = {
'label.domain.router': '<fmt:message key="label.domain.router" />',
'label.console.proxy': '<fmt:message key="label.console.proxy" />',
'label.user.vm': '<fmt:message key="label.user.vm" />',
'label.secondary.storage.vm': '<fmt:message key="label.secondary.storage.vm" />',
'label.resource.limit.exceeded': '<fmt:message key="label.resource.limit.exceeded" />',
'label.direct.attached.public.ip': '<fmt:message key="label.direct.attached.public.ip" />',
'label.usage.sanity.result': '<fmt:message key="label.usage.sanity.result" />',
@ -952,7 +925,10 @@ dictionary2 = {
'message.enabling.vpc.offering': '<fmt:message key="message.enabling.vpc.offering" />',
'message.confirm.remove.vpc.offering': '<fmt:message key="message.confirm.remove.vpc.offering" />',
'message.confirm.disable.vpc.offering': '<fmt:message key="message.confirm.disable.vpc.offering" />',
'label.add.ciscoASA1000v.resource': '<fmt:message key="label.add.ciscoASA1000v.resource" />',
'label.root.certificate': '<fmt:message key="label.root.certificate" />',
'label.intermediate.certificate': '<fmt:message key="label.intermediate.certificate" />',
'label.add.intermediate.certificate': '<fmt:message key="label.add.intermediate.certificate" />',
'label.add.ciscoASA1000v': '<fmt:message key="label.add.ciscoASA1000v" />',
'label.delete.ciscoASA1000v': '<fmt:message key="label.delete.ciscoASA1000v" />',
'message.confirm.delete.ciscoASA1000v': '<fmt:message key="message.confirm.delete.ciscoASA1000v" />',
'label.inside.port.profile': '<fmt:message key="label.inside.port.profile" />',
@ -962,9 +938,7 @@ dictionary2 = {
'label.alert.deleted': '<fmt:message key="label.alert.deleted" />',
'label.alert.archived': '<fmt:message key="label.alert.archived" />',
'label.volume.details': '<fmt:message key="label.volume.details" />',
'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
'label.volume.migrated': '<fmt:message key="label.volume.migrated" />',
'label.failed.update.xenserver.tools.61': '<fmt:message key="label.failed.update.xenserver.tools.61" />',
'label.storage.pool': '<fmt:message key="label.storage.pool" />',
'message.confirm.remove.selected.events': '<fmt:message key="message.confirm.remove.selected.events" />',
'message.confirm.archive.selected.events': '<fmt:message key="message.confirm.archive.selected.events" />',
@ -1012,7 +986,6 @@ dictionary2 = {
'label.acl.id': '<fmt:message key="label.acl.id" />',
'label.passive': '<fmt:message key="label.passive" />',
'label.replace.acl.list': '<fmt:message key="label.replace.acl.list" />',
'label.persistent': '<fmt:message key="label.persistent" />',
'label.vswitch.name': '<fmt:message key="label.vswitch.name" />',
'label.vSwitch.type': '<fmt:message key="label.vSwitch.type" />',
'label.ping.path': '<fmt:message key="label.ping.path" />',
@ -1020,13 +993,8 @@ dictionary2 = {
'label.health.check.interval.in.sec': '<fmt:message key="label.health.check.interval.in.sec" />',
'label.healthy.threshold': '<fmt:message key="label.healthy.threshold" />',
'label.unhealthy.threshold': '<fmt:message key="label.unhealthy.threshold" />',
'label.availabilityzone': '<fmt:message key="label.availabilityzone" />',
'label.diskoffering': '<fmt:message key="label.diskoffering" />',
'label.format': '<fmt:message key="label.format" />',
'label.other': '<fmt:message key="label.other" />',
'label.size': '<fmt:message key="label.size" />',
'label.vm.id': '<fmt:message key="label.vm.id" />',
'label.other': '<fmt:message key="label.other" />',
'label.vnmc': '<fmt:message key="label.vnmc" />',
'label.scale.up.policy': '<fmt:message key="label.scale.up.policy" />',
'label.counter': '<fmt:message key="label.counter" />',

View File

@ -3339,7 +3339,7 @@
},
ispersistent: {
label: 'label.persistent ',
label: 'label.persistent',
converter: cloudStack.converters.toBooleanText
},

View File

@ -1501,7 +1501,7 @@
label: 'label.vm.id',
converter: function(args) {
if (args == null)
return 'state.detached';
return _l('state.detached');
else
return args;
}

View File

@ -2086,7 +2086,7 @@
label: 'label.action.copy.ISO',
messages: {
notification: function(args) {
return 'Copying ISO';
return 'label.copying.iso';
}
},
createForm: {

View File

@ -228,7 +228,7 @@
}
} else if (result.jobstatus == 2) {
cloudStack.dialog.notice({
message: 'message.update.ssl.failed' + ' ' + _s(result.jobresult.errortext)
message: _l('message.update.ssl.failed') + ' ' + _s(result.jobresult.errortext)
});
$loading.remove();
}
@ -236,7 +236,7 @@
},
error: function(XMLHttpResponse) {
cloudStack.dialog.notice({
message: 'message.update.ssl.failed' + ' ' + parseXMLHttpResponse(XMLHttpResponse)
message: _l('message.update.ssl.failed') + ' ' + parseXMLHttpResponse(XMLHttpResponse)
});
$loading.remove();
}
@ -245,7 +245,7 @@
},
error: function(XMLHttpResponse) {
cloudStack.dialog.notice({
message: 'message.update.ssl.failed' + ' ' + parseXMLHttpResponse(XMLHttpResponse)
message: _l('message.update.ssl.failed') + ' ' + parseXMLHttpResponse(XMLHttpResponse)
});
$loading.remove();
}