From 17ac271c3e809ffc0f535d458ea505d917b3da58 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 13 Feb 2012 16:42:47 -0800 Subject: [PATCH] 3.0 UI - localize hypervisor capabilities page. --- .../classes/resources/messages.properties | 9 ++++- ui/scripts/configuration.js | 39 +++++++++---------- ui/scripts/system.js | 36 ++++++++--------- 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 244ce2457c3..7ee58324d18 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1002,4 +1002,11 @@ error.unresolved.internet.name=Your internet name cannot be resolved. #Jes message.add.system.service.offering=Please fill in the following data to add a new system service offering. message.action.delete.system.service.offering=Please confirm that you want to delete this system service offering. -label.action.delete.system.service.offering=Delete System Service Offering \ No newline at end of file +label.action.delete.system.service.offering=Delete System Service Offering +hypervisor.capabilities=Hypervisor capabilities +hypervisor.version=Hypervisor version +max.guest.limit=Max guest limit +security.group.enabled=Security group enabled +add.network.offering=Add network offering +services=Services +service.capabilities=Service Capabilities \ No newline at end of file diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 86e8b5337ae..29bccb22116 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -896,14 +896,14 @@ hypervisorCapabilities: { type: 'select', - title: 'Hypervisor capabilities', + title: 'hypervisor.capabilities', listView: { id: 'hypervisorCapabilities', - label: 'Hypervisor capabilities', + label: 'hypervisor.capabilities', fields: { - hypervisor: { label: 'Hypervisor' }, - hypervisorversion: { label: 'Hypervisor version' }, - maxguestslimit: { label: 'Max guest limit' } + hypervisor: { label: 'label.hypervisor' }, + hypervisorversion: { label: 'hypervisor.version' }, + maxguestslimit: { label: 'max.guest.limit' } }, dataProvider: function(args) { var array1 = []; @@ -961,14 +961,14 @@ fields: [ { id: { label: 'label.id' }, - hypervisor: { label: 'Hypervisor' }, - hypervisorversion: { label: 'Hypervisor version' }, + hypervisor: { label: 'label.hypervisor' }, + hypervisorversion: { label: 'hypervisor.version' }, maxguestslimit: { - label: 'Max guest limit', + label: 'max.guest.limit', isEditable: true }, securitygroupenabled: { - label: 'Security group enabled', + label: 'security.group.enabled', converter: cloudStack.converters.toBooleanText } } @@ -988,10 +988,10 @@ networkOfferings: { type: 'select', - title: 'Network offerings', + title: 'label.menu.network.offerings', listView: { id: 'networkOfferings', - label: 'Network offerings', + label: 'label.menu.network.offerings', fields: { name: { label: 'label.name' }, state: { @@ -999,7 +999,7 @@ // For localization return str; }, - label: 'State', indicator: { 'Enabled': 'on', 'Disabled': 'off', 'Destroyed': 'off' } + label: 'label.state', indicator: { 'Enabled': 'on', 'Disabled': 'off', 'Destroyed': 'off' } } }, @@ -1047,11 +1047,10 @@ actions: { add: { - label: 'Add network offering', + label: 'add.network.offering', createForm: { - title: 'Add network offering', - desc: 'Please specify the network offering', + title: 'add.network.offering', preFilter: function(args) { var $availability = args.$form.find('.form-item[rel=availability]'); var $serviceOfferingId = args.$form.find('.form-item[rel=serviceOfferingId]'); @@ -1096,7 +1095,7 @@ networkRate: { label: 'label.network.rate' }, trafficType: { - label: 'Traffic Type', validation: { required: true }, + label: 'label.traffic.type', validation: { required: true }, select: function(args) { args.response.success({ data: [ @@ -1631,7 +1630,7 @@ label: 'label.description', isEditable: true }, - state: { label: 'State' }, + state: { label: 'label.state' }, guestiptype: { label: 'Guest type' }, @@ -1676,13 +1675,13 @@ } }, traffictype: { - label: 'Traffic type' + label: 'label.traffic.type' }, supportedServices: { - label: 'Services' + label: 'services' }, serviceCapabilities: { - label: 'Service Capabilities' + label: 'service.capabilities' } } ], diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 4fb15bb2a88..d2767e5b0e2 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -219,7 +219,7 @@ fields: { name: { label: 'label.name' }, state: { - label: 'State', + label: 'label.state', converter: function(str) { // For localization return str; @@ -298,7 +298,7 @@ title: 'label.details', fields: [ { - traffictype: { label: 'Traffic type' }, + traffictype: { label: 'label.traffic.type' }, broadcastdomaintype: { label: 'Broadcast domain type' } }, { @@ -446,7 +446,7 @@ title: 'label.details', fields: [ { - traffictype: { label: 'Traffic type' }, + traffictype: { label: 'label.traffic.type' }, broadcastdomaintype: { label: 'Broadcast domain type' } }, { @@ -603,7 +603,7 @@ title: 'label.details', fields: [ { - traffictype: { label: 'Traffic type' }, + traffictype: { label: 'label.traffic.type' }, broadcastdomaintype: { label: 'Broadcast domain type' } }, { @@ -723,7 +723,7 @@ }, fields: [ { - state: { label: 'State' }, + state: { label: 'label.state' }, startVlan: { label: 'Start Vlan', isEditable: true @@ -1610,7 +1610,7 @@ label: 'Type' }, state: { - label: 'State' + label: 'label.state' }, restartrequired: { label: 'Restart required', @@ -1703,7 +1703,7 @@ // For localization return str; }, - label: 'State', indicator: { 'Enabled': 'on', 'Disabled': 'off' } + label: 'label.state', indicator: { 'Enabled': 'on', 'Disabled': 'off' } }, vlan: { label: 'VLAN Range' } } @@ -1901,7 +1901,7 @@ }, { id: { label: 'label.id' }, - state: { label: 'State' }, + state: { label: 'label.state' }, physicalnetworkid: { label: 'Physical network ID' }, destinationphysicalnetworkid: { label: 'Destination physical networkID' } }, @@ -2274,7 +2274,7 @@ }, { id: { label: 'label.id' }, - state: { label: 'State' }, + state: { label: 'label.state' }, publicip: { label: 'Public IP' }, guestipaddress: { label: 'Guest IP' }, linklocalip: { label: 'Link local IP' }, @@ -3016,7 +3016,7 @@ name: { label: 'label.name' } }, { - state: { label: 'State' }, + state: { label: 'label.state' }, id: { label: 'label.id' }, physicalnetworkid: { label: 'Physical network ID' } } @@ -3755,7 +3755,7 @@ }, { id: { label: 'label.id' }, - state: { label: 'State' }, + state: { label: 'label.state' }, systemvmtype: { label: 'Type', converter: function(args) { @@ -4751,7 +4751,7 @@ fields: { name: { label: 'label.name' }, podname: { label: 'Pod' }, - hypervisortype: { label: 'Hypervisor' }, + hypervisortype: { label: 'label.hypervisor' }, //allocationstate: { label: 'Allocation State' }, //managedstate: { label: 'Managed State' }, state: { @@ -4759,7 +4759,7 @@ // For localization return str; }, - label: 'State', + label: 'label.state', indicator: { 'Enabled': 'on', 'Destroyed': 'off'} } }, @@ -4826,7 +4826,7 @@ desc: 'Please fill in the following data to add a new cluster.', fields: { hypervisor: { - label: 'Hypervisor', + label: 'label.hypervisor', select: function(args) { $.ajax({ url: createURL("listHypervisors"), @@ -5170,11 +5170,11 @@ id: { label: 'label.id' }, zonename: { label: 'Zone' }, podname: { label: 'Pod' }, - hypervisortype: { label: 'Hypervisor' }, + hypervisortype: { label: 'label.hypervisor' }, clustertype: { label: 'Cluster type' }, //allocationstate: { label: 'Allocation State' }, //managedstate: { label: 'Managed State' }, - state: { label: 'State' } + state: { label: 'label.state' } } ], dataProvider: function(args) { @@ -5761,7 +5761,7 @@ { id: { label: 'label.id' }, resourcestate: { label: 'Resource state' }, - state: { label: 'State' }, + state: { label: 'label.state' }, type: { label: 'Type' }, zonename: { label: 'Zone' }, podname: { label: 'Pod' }, @@ -6442,7 +6442,7 @@ }, { id: { label: 'label.id' }, - state: { label: 'State' }, + state: { label: 'label.state' }, tags: { label: 'label.storage.tags', isEditable: true