Skip to content

Commit 9ce8a1c

Browse files
vetrivelcbfederle
vetrivelc
authored and
bfederle
committed
Fixed label issue and externalized hardcoding issues
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
1 parent 41b871b commit 9ce8a1c

7 files changed

Lines changed: 1531 additions & 1433 deletions

File tree

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ label.disk.total=Disk Total
551551
label.disk.volume=Disk Volume
552552
label.disk.write.bytes=Disk Write (Bytes)
553553
label.disk.write.io=Disk Write (IO)
554-
label.display.name=Display name
555554
label.display.text=Display Text
556555
label.dns.1=DNS 1
557556
label.dns.2=DNS 2
@@ -1222,7 +1221,8 @@ label.view=View
12221221
label.viewing=Viewing
12231222
label.virtual.appliance=Virtual Appliance
12241223
label.virtual.appliances=Virtual Appliances
1225-
label.virtual.machines=Virtual machines
1224+
label.virtual.machines=Virtual Machines
1225+
label.virtual.machine=Virtual Machine
12261226
label.virtual.network=Virtual Network
12271227
label.virtual.router=Virtual Router
12281228
label.virtual.routers=Virtual Routers
@@ -1280,7 +1280,6 @@ label.xenserver.traffic.label=XenServer traffic label
12801280
label.yes=Yes
12811281
label.zone.details=Zone details
12821282
label.zone.id=Zone ID
1283-
label.zone.name=Zone name
12841283
label.zone.step.1.title=Step 1\: <strong>Select a Network</strong>
12851284
label.zone.step.2.title=Step 2\: <strong>Add a Zone</strong>
12861285
label.zone.step.3.title=Step 3\: <strong>Add a Pod</strong>
@@ -2039,13 +2038,11 @@ state.Destroyed=Destroyed
20392038
state.detached=Detached
20402039
state.Disabled=Disabled
20412040
state.Enabled=Enabled
2042-
state.enabled=Enabled
20432041
state.Error=Error
20442042
state.Expunging=Expunging
20452043
state.Migrating=Migrating
20462044
state.Pending=Pending
20472045
state.Ready=Ready
2048-
state.ready=Ready
20492046
state.Running=Running
20502047
state.Starting=Starting
20512048
state.Stopped=Stopped
@@ -2076,3 +2073,21 @@ label.delete.baremetal.rack.configuration=Delete Baremetal Rack Configuration
20762073
message.confirm.delete.baremetal.rack.configuration=Please confirm that you want to delete Baremetal Rack Configuration.
20772074
message.added.new.nuage.vsp.controller=Added new Nuage Vsp Controller
20782075
message.added.vpc.offering=Added VPC offering
2076+
label.keyboard.language=Keyboard language
2077+
label.standard.us.keyboard=Standard (US) keyboard
2078+
label.uk.keyboard=UK keyboard
2079+
label.japanese.keyboard=Japanese keyboard
2080+
label.simplified.chinese.keyboard=Simplified Chinese keyboard
2081+
label.display.name=Display Name
2082+
label.zone.name=Zone Name
2083+
label.instances=Instances
2084+
label.event=Event
2085+
label.minutes.past.hour=minutes(s) past the hour
2086+
label.snapshots=snapshot(s)
2087+
label.time.colon=Time:
2088+
label.min.past.the.hr=min past the hr
2089+
label.timezone.colon=Timezone:
2090+
label.keep.colon=Keep:
2091+
label.every=Every
2092+
label.day=Day
2093+
label.of.month=of month

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

Lines changed: 720 additions & 686 deletions
Large diffs are not rendered by default.

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

Lines changed: 675 additions & 641 deletions
Large diffs are not rendered by default.

‎tools/ngui/static/js/common/dictionary.js‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,50 @@
1818
angular.module('cloudstack').factory("Dictionary", function(){
1919
var dictionary = {
2020
labels: {
21-
id : 'ID',
22-
username : 'Username',
23-
account : 'Account',
24-
domain : 'Domain',
25-
state : 'State',
26-
displayname : 'Display Name',
27-
instancename : 'Instance Name',
28-
zonename : 'Zone Name',
29-
type : 'Type',
30-
description : 'Description',
31-
created : 'Created',
32-
name : 'Name',
33-
value : 'Value',
34-
displaytext : 'Description',
35-
networktype : 'Network Type',
36-
allocationstate : 'Allocation State',
37-
vmdisplayname: 'VM display name',
38-
hypervisor : 'Hypervisor',
39-
virtualmachine: 'Virtual Machine',
40-
virtualmachines: 'Virtual Machines',
41-
network: 'Network',
42-
networks: 'Networks',
43-
instances: 'Instances',
44-
event: 'Event',
45-
events: 'Events',
46-
globalsettings: 'Global Settings',
47-
accounts: 'Accounts',
48-
domains: 'Domains',
49-
storage: 'Storage',
50-
configurations: 'Global Settings',
51-
serviceofferings: 'Service Offerings',
52-
home: 'Home',
53-
projects: 'Projects',
54-
volumename: 'Volume',
55-
intervaltype: 'Interval Type',
56-
availabilityZone: 'Availability Zone',
57-
diskoffering: 'Disk Offering',
58-
format: 'Format',
59-
url: 'URL',
60-
checksum: 'MD5 Checksum',
61-
password: 'Password',
62-
email: 'Email',
63-
firstname: 'First Name',
64-
lastname: 'Last Name',
21+
id : 'label.id',
22+
username : 'label.username',
23+
account : 'label.account',
24+
domain : 'label.domain',
25+
state : 'label.state',
26+
displayname : 'label.display.name',
27+
instancename : 'label.instance.name',
28+
zonename : 'label.zone.name',
29+
type : 'label.type',
30+
description : 'label.description',
31+
created : 'label.created',
32+
name : 'label.name',
33+
value : 'label.value',
34+
displaytext : 'label.description',
35+
networktype : 'label.network.type',
36+
allocationstate : 'label.allocation.state',
37+
vmdisplayname: 'label.vm.display.name',
38+
hypervisor : 'label.hypervisor',
39+
virtualmachine: 'label.virtual.machine',
40+
virtualmachines: 'label.virtual.machines',
41+
network: 'label.menu.network',
42+
networks: 'label.networks',
43+
instances: 'label.instances',
44+
event: 'label.event',
45+
events: 'label.menu.events',
46+
globalsettings: 'label.menu.global.settings',
47+
accounts: 'label.accounts',
48+
domains: 'label.menu.domains',
49+
storage: 'label.menu.storage',
50+
configurations: 'label.menu.global.settings',
51+
serviceofferings: 'label.menu.service.offerings',
52+
home: 'label.home',
53+
projects: 'label.projects',
54+
volumename: 'label.volume',
55+
intervaltype: 'label.interval.type',
56+
availabilityZone: 'label.availability.zone',
57+
diskoffering: 'label.disk.offering',
58+
format: 'label.format',
59+
url: 'label.url',
60+
checksum: 'label.md5.checksum',
61+
password: 'label.password',
62+
email: 'label.email',
63+
firstname: 'label.first.name',
64+
lastname: 'label.last.name',
6565
}
6666
};
6767
return dictionary;

‎ui/dictionary2.jsp‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,5 +1035,20 @@ $.extend(dictionary, {
10351035
'message.confirm.delete.baremetal.rack.configuration': '<fmt:message key="message.confirm.delete.baremetal.rack.configuration" />',
10361036
'message.added.new.nuage.vsp.controller': '<fmt:message key="message.added.new.nuage.vsp.controller" />',
10371037
'message.added.vpc.offering': '<fmt:message key="message.added.vpc.offering" />',
1038+
'label.group.by.account': '<fmt:message key="label.group.by.account" />',
1039+
'label.keyboard.language': '<fmt:message key="label.keyboard.language" />',
1040+
'label.standard.us.keyboard': '<fmt:message key="label.standard.us.keyboard" />',
1041+
'label.uk.keyboard': '<fmt:message key="label.uk.keyboard" />',
1042+
'label.japanese.keyboard': '<fmt:message key="label.japanese.keyboard" />',
1043+
'label.simplified.chinese.keyboard': '<fmt:message key="label.simplified.chinese.keyboard" />',
1044+
'label.time.colon': '<fmt:message key="label.time.colon" />',
1045+
'label.min.past.the.hr': '<fmt:message key="label.min.past.the.hr" />',
1046+
'label.timezone.colon': '<fmt:message key="label.timezone.colon" />',
1047+
'label.keep.colon': '<fmt:message key="label.keep.colon" />',
1048+
'label.every': '<fmt:message key="label.every" />',
1049+
'label.day': '<fmt:message key="label.day" />',
1050+
'label.of.month': '<fmt:message key="label.of.month" />',
1051+
'label.minutes.past.hour': '<fmt:message key="label.minutes.past.hour" />',
1052+
'label.snapshots': '<fmt:message key="label.snapshots" />',
10381053
});
10391054
</script>

0 commit comments

Comments
 (0)