Skip to content

Commit 0646588

Browse files
Mihaela Stoicabfederle
Mihaela Stoica
authored and
bfederle
committed
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
1 parent d46251f commit 0646588

7 files changed

Lines changed: 110 additions & 50 deletions

File tree

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,6 +1524,77 @@ label.vgpu.video.ram=Video RAM
15241524
label.vgpu.max.resolution=Max resolution
15251525
label.vgpu.max.vgpu.per.gpu=vGPUs per GPU
15261526
label.vgpu.remaining.capacity=Remaining capacity
1527+
label.routing.host=Routing Host
1528+
label.usage.server=Usage Server
1529+
label.user.vm=User VM
1530+
label.resource.limit.exceeded=Resource Limit Exceeded
1531+
label.direct.attached.public.ip=Direct Attached Public IP
1532+
label.usage.sanity.result=Usage Sanity Result
1533+
label.select.region=Select region
1534+
label.info.upper=INFO
1535+
label.warn.upper=WARN
1536+
label.error.upper=ERROR
1537+
label.event.deleted=Event Deleted
1538+
label.add.ciscoASA1000v=Add CiscoASA1000v Resource
1539+
label.delete.ciscoASA1000v=Delete CiscoASA1000v
1540+
label.inside.port.profile=Inside Port Profile
1541+
label.archive=Archive
1542+
label.event.archived=Event Archived
1543+
label.alert.details=Alert details
1544+
label.alert.deleted=Alert Deleted
1545+
label.alert.archived=Alert Archived
1546+
label.volume.details=Volume details
1547+
label.volume.migrated=Volume migrated
1548+
label.storage.pool=Storage Pool
1549+
label.enable.host=Enable Host
1550+
label.disable.host=Disable Host
1551+
label.copying.iso=Copying ISO
1552+
label.add.internal.lb=Add Internal LB
1553+
label.internal.lb.details=Internal LB details
1554+
label.delete.internal.lb=Delete Internal LB
1555+
label.remove.vm.load.balancer=Remove VM from load balancer
1556+
label.add.acl.list=Add ACL List
1557+
label.add.list.name=ACL List Name
1558+
label.add.network.acl.list=Add Network ACL List
1559+
label.delete.acl.list=Delete ACL List
1560+
label.acl.replaced=ACL replaced
1561+
label.ipv4.dns1=IPv4 DNS1
1562+
label.ipv4.dns2=IPv4 DNS2
1563+
label.protocol.number=Protocol Number
1564+
label.edit.acl.rule=Edit ACL rule
1565+
label.source.ip.address=Source IP Address
1566+
label.source.port=Source Port
1567+
label.instance.port=Instance Port
1568+
label.assigned.vms=Assigned VMs
1569+
label.replace.acl=Replace ACL
1570+
label.source.nat.supported=SourceNAT Supported
1571+
label.acl.name=ACL Name
1572+
label.acl.id=ACL ID
1573+
label.passive=Passive
1574+
label.replace.acl.list=Replace ACL List
1575+
label.vswitch.name=vSwitch Name
1576+
label.vSwitch.type=vSwitch Type
1577+
label.ping.path=Ping Path
1578+
label.response.timeout.in.sec=Response Timeout (in sec)
1579+
label.health.check.interval.in.sec=Health Check Interval (in sec)
1580+
label.healthy.threshold=Healthy Threshold
1581+
label.unhealthy.threshold=Unhealthy Threshold
1582+
label.other=Other
1583+
label.vm.id=VM ID
1584+
label.vnmc=VNMC
1585+
label.scale.up.policy=SCALE UP POLICY
1586+
label.counter=Counter
1587+
label.operator=Operator
1588+
label.threshold=Threshold
1589+
label.load.balancer.type=Load Balancer Type
1590+
label.vgpu=VGPU
1591+
label.sticky.name=Sticky Name
1592+
label.stickiness.method=Stickiness method
1593+
label.gslb=GSLB
1594+
label.portable.ip=Portable IP
1595+
label.internallbvm=InternalLbVm
1596+
label.agent.state=Agent State
1597+
label.duration.in.sec=Duration(in sec)
15271598
managed.state=Managed State
15281599
message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC.
15291600
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
16561727
message.confirm.join.project=Please confirm you wish to join this project.
16571728
message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range.
16581729
message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider
1730+
message.confirm.current.guest.CIDR.unchanged=Do you want to keep the current guest network CIDR unchanged?
1731+
message.confirm.delete.ciscoASA1000v=Please confirm you want to delete CiscoASA1000v
1732+
message.confirm.remove.selected.events=Please confirm you would like to remove the selected events
1733+
message.confirm.archive.selected.events=Please confirm you would like to archive the selected events
1734+
message.confirm.remove.event=Are you sure you want to remove this event?
1735+
message.confirm.archive.event=Please confirm that you want to archive this event.
1736+
message.confirm.remove.selected.alerts=Please confirm you would like to remove the selected alerts
1737+
message.confirm.archive.selected.alerts=Please confirm you would like to archive the selected alerts
1738+
message.confirm.delete.alert=Are you sure you want to delete this alert ?
1739+
message.confirm.archive.alert=Please confirm that you want to archive this alert.
1740+
message.confirm.migrate.volume=Do you want to migrate this volume?
1741+
message.confirm.attach.disk=Are you sure you want to attach disk?
1742+
message.confirm.create.volume=Are you sure you want to create volume?
1743+
message.confirm.enable.host=Please confirm that you want to enable the host
1744+
message.confirm.disable.host=Please confirm that you want to disable the host
1745+
message.confirm.delete.internal.lb=Please confirm you want to delete Internal LB
1746+
message.confirm.remove.load.balancer=Please confirm you want to remove VM from load balancer
1747+
message.confirm.delete.acl.list=Are you sure you want to delete this ACL list?
1748+
message.confirm.replace.acl.new.one=Do you want to replace the ACL with a new one?
16591749
message.copy.iso.confirm=Please confirm that you wish to copy your ISO to
16601750
message.copy.template=Copy template <b id\="copy_template_name_text">XXX</b> from zone <b id\="copy_template_source_zone_text"></b> to
16611751
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.
18261916
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.
18271917
message.update.resource.count=Please confirm that you want to update resource counts for this account.
18281918
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\:
1919+
message.update.ssl.succeeded=Update SSL Certificates succeeded
1920+
message.update.ssl.failed=Failed to update SSL Certificate.
18291921
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.
18301922
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.
18311923
message.vm.create.template.confirm=Create Template will reboot the VM automatically.
@@ -1944,6 +2036,7 @@ state.Completed=Completed
19442036
state.Creating=Creating
19452037
state.Declined=Declined
19462038
state.Destroyed=Destroyed
2039+
state.detached=Detached
19472040
state.Disabled=Disabled
19482041
state.Enabled=Enabled
19492042
state.enabled=Enabled

‎ui/dictionary.jsp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,6 @@ dictionary = {
964964
'label.projects': '<fmt:message key="label.projects" />',
965965
'label.project.view': '<fmt:message key="label.project.view" />',
966966
'label.protocol': '<fmt:message key="label.protocol" />',
967-
'label.providers': '<fmt:message key="label.providers" />',
968967
'label.provider': '<fmt:message key="label.provider" />',
969968
'label.providers': '<fmt:message key="label.providers" />',
970969
'label.public': '<fmt:message key="label.public" />',

‎ui/dictionary2.jsp‎

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,6 @@ under the License.
2525
<% long now = System.currentTimeMillis(); %>
2626
<script type="text/javascript">
2727
dictionary2 = {
28-
'label.resource': '<fmt:message key="label.resource" />',
29-
'label.resource.limits': '<fmt:message key="label.resource.limits" />',
30-
'label.resources': '<fmt:message key="label.resources" />',
31-
'label.resource.state': '<fmt:message key="label.resource.state" />',
32-
'label.restart.network': '<fmt:message key="label.restart.network" />',
33-
'label.restart.required': '<fmt:message key="label.restart.required" />',
34-
'label.restart.vpc': '<fmt:message key="label.restart.vpc" />',
35-
'label.restore': '<fmt:message key="label.restore" />',
36-
'label.retry.interval': '<fmt:message key="label.retry.interval" />',
37-
'label.review': '<fmt:message key="label.review" />',
38-
'label.revoke.project.invite': '<fmt:message key="label.revoke.project.invite" />',
39-
'label.role': '<fmt:message key="label.role" />',
40-
'label.root.disk.controller': '<fmt:message key="label.root.disk.controller" />',
41-
'label.root.disk.offering': '<fmt:message key="label.root.disk.offering" />',
42-
'label.round.robin': '<fmt:message key="label.round.robin" />',
4328
'label.rules': '<fmt:message key="label.rules" />',
4429
'label.running.vms': '<fmt:message key="label.running.vms" />',
4530
'label.s3.access_key': '<fmt:message key="label.s3.access_key" />',
@@ -101,7 +86,7 @@ dictionary2 = {
10186
'label.specify.IP.ranges': '<fmt:message key="label.specify.IP.ranges" />',
10287
'label.specify.vlan': '<fmt:message key="label.specify.vlan" />',
10388
'label.specify.vxlan': '<fmt:message key="label.specify.vxlan" />',
104-
'label.SR.name ': '<fmt:message key="label.SR.name " />',
89+
'label.SR.name': '<fmt:message key="label.SR.name" />',
10590
'label.srx': '<fmt:message key="label.srx" />',
10691
'label.PA': '<fmt:message key="label.PA" />',
10792
'label.start.IP': '<fmt:message key="label.start.IP" />',
@@ -175,7 +160,7 @@ dictionary2 = {
175160
'label.tier': '<fmt:message key="label.tier" />',
176161
'label.time': '<fmt:message key="label.time" />',
177162
'label.timeout': '<fmt:message key="label.timeout" />',
178-
'label.timeout.in.second ': '<fmt:message key="label.timeout.in.second " />',
163+
'label.timeout.in.second': '<fmt:message key="label.timeout.in.second" />',
179164
'label.time.zone': '<fmt:message key="label.time.zone" />',
180165
'label.timezone': '<fmt:message key="label.timezone" />',
181166
'label.token': '<fmt:message key="label.token" />',
@@ -289,7 +274,7 @@ dictionary2 = {
289274
'label.zone.wide': '<fmt:message key="label.zone.wide" />',
290275
'label.ldap.group.name': '<fmt:message key="label.ldap.group.name" />',
291276
'label.password.reset.confirm': '<fmt:message key="label.password.reset.confirm" />',
292-
'label.openDaylight': '<fmt:message key="OpenDaylight" />',
277+
'label.openDaylight': '<fmt:message key="label.openDaylight" />',
293278
'label.change.affinity': '<fmt:message key="label.change.affinity" />',
294279
'label.assign.instance.another': '<fmt:message key="label.assign.instance.another" />',
295280
'label.network.addVM': '<fmt:message key="label.network.addVM" />',
@@ -305,18 +290,17 @@ dictionary2 = {
305290
'label.VPC.limits': '<fmt:message key="label.VPC.limits" />',
306291
'label.gslb.domain.name': '<fmt:message key="label.gslb.domain.name" />',
307292
'label.edit.region': '<fmt:message key="label.edit.region" />',
308-
'label.gslb.domain.name': '<fmt:message key="label.gslb.domain.name" />',
309293
'label.add.gslb': '<fmt:message key="label.add.gslb" />',
310294
'label.gslb.servicetype': '<fmt:message key="label.gslb.servicetype" />',
311295
'label.gslb.details': '<fmt:message key="label.gslb.details" />',
312296
'label.gslb.delete': '<fmt:message key="label.gslb.delete" />',
313297
'message.gslb.delete.confirm': '<fmt:message key="message.gslb.delete.confirm" />',
314-
'label.opendaylight.controllers': '<fmt:message key="OpenDaylight Controllers" />',
298+
'label.opendaylight.controllers': '<fmt:message key="label.opendaylight.controllers" />',
315299
'label.portable.ip.ranges': '<fmt:message key="label.portable.ip.ranges" />',
316300
'label.add.portable.ip.range': '<fmt:message key="label.add.portable.ip.range" />',
317301
'label.delete.portable.ip.range': '<fmt:message key="label.delete.portable.ip.range" />',
318302
'message.portable.ip.delete.confirm': '<fmt:message key="message.portable.ip.delete.confirm" />',
319-
'label.opendaylight.controllerdetail': '<fmt:message key="OpenDaylight Controller Details" />',
303+
'label.opendaylight.controllerdetail': '<fmt:message key="label.opendaylight.controllerdetail" />',
320304
'label.portable.ip.range.details': '<fmt:message key="label.portable.ip.range.details" />',
321305
'label.portable.ips': '<fmt:message key="label.portable.ips" />',
322306
'label.gslb.assigned.lb': '<fmt:message key="label.gslb.assigned.lb" />',
@@ -328,18 +312,14 @@ dictionary2 = {
328312
'label.disable.autoscale': '<fmt:message key="label.disable.autoscale" />',
329313
'label.min.instances': '<fmt:message key="label.min.instances" />',
330314
'label.max.instances': '<fmt:message key="label.max.instances" />',
331-
'label.add.OpenDaylight.device': '<fmt:message key="Add OpenDaylight Controller" />',
332-
'label.delete.OpenDaylight.device': '<fmt:message key="Delete OpenDaylight Controller" />',
315+
'label.add.OpenDaylight.device': '<fmt:message key="label.add.OpenDaylight.device" />',
316+
'label.delete.OpenDaylight.device': '<fmt:message key="label.delete.OpenDaylight.device" />',
333317
'label.show.advanced.settings': '<fmt:message key="label.show.advanced.settings" />',
334318
'label.polling.interval.sec': '<fmt:message key="label.polling.interval.sec" />',
335319
'label.quiet.time.sec': '<fmt:message key="label.quiet.time.sec" />',
336320
'label.destroy.vm.graceperiod': '<fmt:message key="label.destroy.vm.graceperiod" />',
337321
'label.SNMP.community': '<fmt:message key="label.SNMP.community" />',
338322
'label.SNMP.port': '<fmt:message key="label.SNMP.port" />',
339-
'label.add.ucs.manager': '<fmt:message key="label.add.ucs.manager" />',
340-
'label.ovm.traffic.label': '<fmt:message key="label.ovm.traffic.label" />',
341-
'label.lxc.traffic.label': '<fmt:message key="label.lxc.traffic.label" />',
342-
'label.hyperv.traffic.label': '<fmt:message key="label.hyperv.traffic.label" />',
343323
'managed.state': '<fmt:message key="managed.state" />',
344324
'message.gslb.lb.remove.confirm': '<fmt:message key="message.gslb.lb.remove.confirm" />',
345325
'message.admin.guide.read': '<fmt:message key="message.admin.guide.read" />',
@@ -699,7 +679,6 @@ dictionary2 = {
699679
'state.Suspended': '<fmt:message key="state.Suspended" />',
700680
'ui.listView.filters.all': '<fmt:message key="ui.listView.filters.all" />',
701681
'ui.listView.filters.mine': '<fmt:message key="ui.listView.filters.mine" />',
702-
'label.security.groups': '<fmt:message key="label.security.groups" />',
703682
'label.opendaylight.controller': '<fmt:message key="label.opendaylight.controller" />',
704683
'label.resource.name': '<fmt:message key="label.resource.name" />',
705684
'label.reource.id': '<fmt:message key="label.reource.id" />',
@@ -726,7 +705,6 @@ dictionary2 = {
726705
'label.ipv4.cidr': '<fmt:message key="label.ipv4.cidr" />',
727706
'label.guest.network.details': '<fmt:message key="label.guest.network.details" />',
728707
'label.ipv4.gateway': '<fmt:message key="label.ipv4.gateway" />',
729-
'label.release.dedicated.vlan.range': '<fmt:message key="label.release.dedicated.vlan.range" />',
730708
'label.vlan.ranges': '<fmt:message key="label.vlan.ranges" />',
731709
'label.virtual.appliance.details': '<fmt:message key="label.virtual.appliance.details" />',
732710
'label.start.lb.vm': '<fmt:message key="label.start.lb.vm" />',
@@ -749,8 +727,6 @@ dictionary2 = {
749727
'label.dedicate.zone': '<fmt:message key="label.dedicate.zone" />',
750728
'label.zone.dedicated': '<fmt:message key="label.zone.dedicated" />',
751729
'label.release.dedicated.zone': '<fmt:message key="label.release.dedicated.zone" />',
752-
'label.ipv6.dns1': '<fmt:message key="label.ipv6.dns1" />',
753-
'label.ipv6.dns2': '<fmt:message key="label.ipv6.dns2" />',
754730
'label.vmware.datacenter.name': '<fmt:message key="label.vmware.datacenter.name" />',
755731
'label.vmware.datacenter.vcenter': '<fmt:message key="label.vmware.datacenter.vcenter" />',
756732
'label.vmware.datacenter.id': '<fmt:message key="label.vmware.datacenter.id" />',
@@ -838,7 +814,6 @@ dictionary2 = {
838814
'label.action': '<fmt:message key="label.action" />',
839815
'label.name.lower': '<fmt:message key="label.name.lower" />',
840816
'label.ucs': '<fmt:message key="label.ucs" />',
841-
'label.change.affinity': '<fmt:message key="label.change.affinity" />',
842817
'label.persistent': '<fmt:message key="label.persistent" />',
843818
'label.broadcasturi': '<fmt:message key="label.broadcasturi" />',
844819
'label.network.cidr': '<fmt:message key="label.network.cidr" />',
@@ -847,7 +822,6 @@ dictionary2 = {
847822
'label.health.check': '<fmt:message key="label.health.check" />',
848823
'label.public.load.balancer.provider': '<fmt:message key="label.public.load.balancer.provider" />',
849824
'label.add.isolated.network': '<fmt:message key="label.add.isolated.network" />',
850-
'label.vlan': '<fmt:message key="label.vlan" />',
851825
'label.secondary.isolated.vlan.id': '<fmt:message key="label.secondary.isolated.vlan.id" />',
852826
'label.ipv4.netmask': '<fmt:message key="label.ipv4.netmask" />',
853827
'label.custom': '<fmt:message key="label.custom" />',
@@ -870,7 +844,6 @@ dictionary2 = {
870844
'label.domain.router': '<fmt:message key="label.domain.router" />',
871845
'label.console.proxy': '<fmt:message key="label.console.proxy" />',
872846
'label.user.vm': '<fmt:message key="label.user.vm" />',
873-
'label.secondary.storage.vm': '<fmt:message key="label.secondary.storage.vm" />',
874847
'label.resource.limit.exceeded': '<fmt:message key="label.resource.limit.exceeded" />',
875848
'label.direct.attached.public.ip': '<fmt:message key="label.direct.attached.public.ip" />',
876849
'label.usage.sanity.result': '<fmt:message key="label.usage.sanity.result" />',
@@ -952,7 +925,10 @@ dictionary2 = {
952925
'message.enabling.vpc.offering': '<fmt:message key="message.enabling.vpc.offering" />',
953926
'message.confirm.remove.vpc.offering': '<fmt:message key="message.confirm.remove.vpc.offering" />',
954927
'message.confirm.disable.vpc.offering': '<fmt:message key="message.confirm.disable.vpc.offering" />',
955-
'label.add.ciscoASA1000v.resource': '<fmt:message key="label.add.ciscoASA1000v.resource" />',
928+
'label.root.certificate': '<fmt:message key="label.root.certificate" />',
929+
'label.intermediate.certificate': '<fmt:message key="label.intermediate.certificate" />',
930+
'label.add.intermediate.certificate': '<fmt:message key="label.add.intermediate.certificate" />',
931+
'label.add.ciscoASA1000v': '<fmt:message key="label.add.ciscoASA1000v" />',
956932
'label.delete.ciscoASA1000v': '<fmt:message key="label.delete.ciscoASA1000v" />',
957933
'message.confirm.delete.ciscoASA1000v': '<fmt:message key="message.confirm.delete.ciscoASA1000v" />',
958934
'label.inside.port.profile': '<fmt:message key="label.inside.port.profile" />',
@@ -962,9 +938,7 @@ dictionary2 = {
962938
'label.alert.deleted': '<fmt:message key="label.alert.deleted" />',
963939
'label.alert.archived': '<fmt:message key="label.alert.archived" />',
964940
'label.volume.details': '<fmt:message key="label.volume.details" />',
965-
'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
966941
'label.volume.migrated': '<fmt:message key="label.volume.migrated" />',
967-
'label.failed.update.xenserver.tools.61': '<fmt:message key="label.failed.update.xenserver.tools.61" />',
968942
'label.storage.pool': '<fmt:message key="label.storage.pool" />',
969943
'message.confirm.remove.selected.events': '<fmt:message key="message.confirm.remove.selected.events" />',
970944
'message.confirm.archive.selected.events': '<fmt:message key="message.confirm.archive.selected.events" />',
@@ -1012,21 +986,15 @@ dictionary2 = {
1012986
'label.acl.id': '<fmt:message key="label.acl.id" />',
1013987
'label.passive': '<fmt:message key="label.passive" />',
1014988
'label.replace.acl.list': '<fmt:message key="label.replace.acl.list" />',
1015-
'label.persistent': '<fmt:message key="label.persistent" />',
1016989
'label.vswitch.name': '<fmt:message key="label.vswitch.name" />',
1017990
'label.vSwitch.type': '<fmt:message key="label.vSwitch.type" />',
1018991
'label.ping.path': '<fmt:message key="label.ping.path" />',
1019992
'label.response.timeout.in.sec': '<fmt:message key="label.response.timeout.in.sec" />',
1020993
'label.health.check.interval.in.sec': '<fmt:message key="label.health.check.interval.in.sec" />',
1021994
'label.healthy.threshold': '<fmt:message key="label.healthy.threshold" />',
1022995
'label.unhealthy.threshold': '<fmt:message key="label.unhealthy.threshold" />',
1023-
'label.availabilityzone': '<fmt:message key="label.availabilityzone" />',
1024-
'label.diskoffering': '<fmt:message key="label.diskoffering" />',
1025-
'label.format': '<fmt:message key="label.format" />',
1026996
'label.other': '<fmt:message key="label.other" />',
1027-
'label.size': '<fmt:message key="label.size" />',
1028997
'label.vm.id': '<fmt:message key="label.vm.id" />',
1029-
'label.other': '<fmt:message key="label.other" />',
1030998
'label.vnmc': '<fmt:message key="label.vnmc" />',
1031999
'label.scale.up.policy': '<fmt:message key="label.scale.up.policy" />',
10321000
'label.counter': '<fmt:message key="label.counter" />',

‎ui/scripts/configuration.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3339,7 +3339,7 @@
33393339
},
33403340

33413341
ispersistent: {
3342-
label: 'label.persistent ',
3342+
label: 'label.persistent',
33433343
converter: cloudStack.converters.toBooleanText
33443344
},
33453345

0 commit comments

Comments
 (0)