Skip to content

Commit 6a11d09

Browse files
vetrivelcbfederle
vetrivelc
authored and
bfederle
committed
Fix Externalization of hard-coded label strings
-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and 'dictionary2.jsp' -- this is due to JSP file constraints as the localization object is getting quite long -Per change above, 'dictionary' object is now split into an additonal 'dictionary2' object, which is merged with the main dict object on page load -All new dictionary mappings should be added to 'dictionary2' now. Signed-off-by: Brian Federle <brian.federle@citrix.com>
1 parent c661289 commit 6a11d09

33 files changed

Lines changed: 5192 additions & 4946 deletions

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

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ error.session.expired=Your session has expired.
8484
error.something.went.wrong.please.correct.the.following=Something went wrong; please correct the following
8585
error.unable.to.reach.management.server=Unable to reach Management Server
8686
error.unresolved.internet.name=Your internet name cannot be resolved.
87-
extractable=Extractable
87+
label.extractable=Extractable
8888
force.delete.domain.warning=Warning\: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
8989
force.delete=Force Delete
9090
force.remove.host.warning=Warning\: Choosing this option will cause CloudStack to forcefully stop all running virtual machines before removing this host from the cluster.
@@ -437,7 +437,7 @@ label.certificate=Server certificate
437437
label.change.service.offering=Change service offering
438438
label.change.value=Change value
439439
label.character=Character
440-
label.checksum=MD5 checksum
440+
label.md5.checksum=MD5 checksum
441441
label.cidr.account=CIDR or Account/Security Group
442442
label.CIDR.list=CIDR list
443443
label.cidr.list=Source CIDR
@@ -504,17 +504,17 @@ label.default=Default
504504
label.delete.affinity.group=Delete Affinity Group
505505
label.delete.BigSwitchVns=Remove BigSwitch Vns Controller
506506
label.delete.F5=Delete F5
507-
label.delete.gateway=delete gateway
507+
label.delete.gateway=Delete gateway
508508
label.delete.NetScaler=Delete NetScaler
509509
label.delete.NiciraNvp=Remove Nvp Controller
510510
label.delete.NuageVsp=Remove Nuage VSD
511511
label.delete.BrocadeVcs=Remove Brocade Vcs Switch
512512
label.delete.project=Delete project
513513
label.delete.SRX=Delete SRX
514514
label.delete.PA=Delete Palo Alto
515-
label.delete.VPN.connection=delete VPN connection
516-
label.delete.VPN.customer.gateway=delete VPN Customer Gateway
517-
label.delete.VPN.gateway=delete VPN Gateway
515+
label.delete.VPN.connection=Delete VPN connection
516+
label.delete.VPN.customer.gateway=Delete VPN Customer Gateway
517+
label.delete.VPN.gateway=Delete VPN Gateway
518518
label.delete.vpn.user=Delete VPN user
519519
label.delete=Delete
520520
label.deleting.failed=Deleting Failed
@@ -757,6 +757,7 @@ label.LUN.number=LUN \#
757757
label.lun=LUN
758758
label.make.project.owner=Make account project owner
759759
label.manage.resources=Manage Resources
760+
label.management.server=Management Server
760761
label.manage=Manage
761762
label.managed=Managed
762763
label.management.ips=Management IP Addresses
@@ -1000,7 +1001,7 @@ label.remove.static.nat.rule=Remove static NAT rule
10001001
label.remove.static.route=Remove static route
10011002
label.remove.tier=Remove tier
10021003
label.remove.vm.from.lb=Remove VM from load balancer rule
1003-
label.remove.vpc=remove VPC
1004+
label.remove.vpc=Remove VPC
10041005
label.removing.user=Removing User
10051006
label.removing=Removing
10061007
label.required=Required
@@ -1017,7 +1018,7 @@ label.resource=Resource
10171018
label.resources=Resources
10181019
label.restart.network=Restart network
10191020
label.restart.required=Restart required
1020-
label.restart.vpc=restart VPC
1021+
label.restart.vpc=Restart VPC
10211022
label.restore=Restore
10221023
label.retry.interval=Retry Interval
10231024
label.review=Review
@@ -1324,7 +1325,7 @@ label.gslb.domain.name=GSLB Domain Name
13241325
label.add.gslb=Add GSLB
13251326
label.gslb.servicetype=Service Type
13261327
label.gslb.details=GSLB details
1327-
label.gslb.delete=delete GSLB
1328+
label.gslb.delete=Delete GSLB
13281329
label.opendaylight.controller=OpenDaylight Controller
13291330
label.opendaylight.controllers=OpenDaylight Controllers
13301331
label.portable.ip.ranges=Portable IP Ranges
@@ -1333,11 +1334,11 @@ label.delete.portable.ip.range=Delete Portable IP Range
13331334
label.opendaylight.controllerdetail=OpenDaylight Controller Details
13341335
label.portable.ip.range.details=Portable IP Range details
13351336
label.portable.ips=Portable IPs
1336-
label.gslb.assigned.lb=assigned load balancing
1337-
label.gslb.assigned.lb.more=assign more load balancing
1338-
label.gslb.lb.rule=load balancing rule
1339-
label.gslb.lb.details=load balancing details
1340-
label.gslb.lb.remove=remove load balancing from this GSLB
1337+
label.gslb.assigned.lb=Assigned load balancing
1338+
label.gslb.assigned.lb.more=Assign more load balancing
1339+
label.gslb.lb.rule=Load balancing rule
1340+
label.gslb.lb.details=Load balancing details
1341+
label.gslb.lb.remove=Remove load balancing from this GSLB
13411342
label.enable.autoscale=Enable Autoscale
13421343
label.disable.autoscale=Disable Autoscale
13431344
label.min.instances=Min Instances
@@ -1361,21 +1362,21 @@ label.add.vnmc.provider=Add VNMC provider
13611362
label.enable.vnmc.provider=Enable VNMC provider
13621363
label.add.vnmc.device=Add VNMC device
13631364
label.ciscovnmc.resource.details=CiscoVNMC resource details
1364-
label.delete.ciscovnmc.resource=delete CiscoVNMC resource
1365+
label.delete.ciscovnmc.resource=Delete CiscoVNMC resource
13651366
label.enable.vnmc.device=Enable VNMC device
13661367
label.disbale.vnmc.device=Disable VNMC device
13671368
label.disable.vnmc.provider=Disable VNMC provider
13681369
label.services=Services
13691370
label.secondary.staging.store=Secondary Staging Store
13701371
label.release.account=Release from Account
1371-
label.release.account.lowercase=release from account
1372+
label.release.account.lowercase=Release from account
13721373
label.vlan.vni.ranges=VLAN/VNI Range(s)
13731374
label.dedicated.vlan.vni.ranges=Dedicated VLAN/VNI Ranges
13741375
label.dedicate.vlan.vni.range=Dedicate VLAN/VNI Range
13751376
label.vlan.vni.range=VLAN/VNI Range
13761377
label.vlan.range.details=VLAN Range details
13771378
label.release.dedicated.vlan.range=Release dedicated VLAN range
1378-
label.broadcat.uri=broadcast URI
1379+
label.broadcat.uri=Broadcast URI
13791380
label.ipv4.cidr=IPv4 CIDR
13801381
label.guest.network.details=Guest network details
13811382
label.ipv4.gateway=IPv4 Gateway
@@ -1473,10 +1474,10 @@ label.ipv4.end.ip=IPv4 End IP
14731474
label.ipv6.start.ip=IPv6 Start IP
14741475
label.ipv6.end.ip=IPv6 End IP
14751476
label.vm.password=Password of the VM is
1476-
label.group.by.zone=group by zone
1477-
label.group.by.pod=group by pod
1478-
label.group.by.cluster=group by cluster
1479-
label.group.by.account=group by account
1477+
label.group.by.zone=Group by zone
1478+
label.group.by.pod=Group by pod
1479+
label.group.by.cluster=Group by cluster
1480+
label.group.by.account=Group by account
14801481
label.no.grouping=(no grouping)
14811482
label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store
14821483
label.username.lower=username

0 commit comments

Comments
 (0)