From 577f3a5f75340a478cf3a716a66ba91ef7093d22 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 16 Feb 2012 12:22:13 -0800 Subject: [PATCH] cloudstack 3.0 new UI - correct localization label format --- .../classes/resources/messages.properties | 46 +++++----- .../classes/resources/messages_ja.properties | 46 +++++----- ui/index.jsp | 46 +++++----- ui/scripts/configuration.js | 48 +++++------ ui/scripts/system.js | 84 +++++++++---------- ui/scripts/zoneWizard.js | 8 +- 6 files changed, 134 insertions(+), 144 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index f159d8b33a1..27423be6802 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1069,32 +1069,30 @@ error.unresolved.internet.name=Your internet name cannot be resolved. 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 -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 -supported.services=Supported Services -service.capabilities=Service Capabilities -guest.type=Guest Type -specify.IP.ranges=Specify IP ranges -conserve.mode=Conserve mode -created.by.system=Created by system +label.hypervisor.capabilities=Hypervisor capabilities +label.hypervisor.version=Hypervisor version +label.max.guest.limit=Max guest limit +label.add.network.offering=Add network offering +label.supported.services=Supported Services +label.service.capabilities=Service Capabilities +label.guest.type=Guest Type +label.specify.IP.ranges=Specify IP ranges +label.conserve.mode=Conserve mode +label.created.by.system=Created by system label.menu.system.service.offerings=System Service Offerings label.add.system.service.offering=Add System Service Offering -redundant.router.capability=Redundant router capability -supported.source.NAT.type=Supported Source NAT type -elastic.LB=Elastic LB -LB.isolation=LB isolation -elastic.IP=Elastic IP -network.label.display.for.blank.value=Use default gateway -Xen.traffic.label=XenServer traffic label -KVM.traffic.label=KVM traffic label -VMware.traffic.label=VMware traffic label -start.IP=Start IP range -end.IP=End IP range -IP.range.is.added=IP range is added -remove.IP.range=Remove IP range +label.redundant.router.capability=Redundant router capability +label.supported.source.NAT.type=Supported Source NAT type +label.elastic.LB=Elastic LB +label.LB.isolation=LB isolation +label.elastic.IP=Elastic IP +label.network.label.display.for.blank.value=Use default gateway +label.xen.traffic.label=XenServer traffic label +label.kvm.traffic.label=KVM traffic label +label.vmware.traffic.label=VMware traffic label +label.start.IP=Start IP +label.end.IP=End IP +label.remove.ip.range=Remove IP range storage.traffic.type.is.updated=Storage traffic type is updated management.traffic.type.is.updated=Management traffic type is updated public.traffic.type.is.updated=Public traffic type is updated diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index cbce3652b23..c2a54d8f480 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -1072,32 +1072,30 @@ error.unresolved.internet.name=名前解決に失敗しました message.add.system.service.offering=新しいシステム·サービスの提供を追加するには、次のデータを記入してください。 message.action.delete.system.service.offering=このシステムサービスの提供を削除することを確認してください。 label.action.delete.system.service.offering=削除システムサービスの提供 -hypervisor.capabilities=機能をハイパーバイザ -hypervisor.version=のバージョンをハイパーバイザ -max.guest.limit=最大ゲストの制限 -security.group.enabled=セキュリティグループが有効になって -add.network.offering=ネットワークの提供を追加します。 -supported.services=サポートされているサービス -service.capabilities=サービス機能 -guest.type=ゲストの種類 -specify.IP.ranges=指定したIPの範囲 -conserve.mode=モードを節約 -created.by.system=システムによって作成され +label.hypervisor.capabilities=機能をハイパーバイザ +label.hypervisor.version=のバージョンをハイパーバイザ +label.max.guest.limit=最大ゲストの制限 +label.add.network.offering=ネットワークの提供を追加します。 +label.supported.services=サポートされているサービス +label.service.capabilities=サービス機能 +label.guest.type=ゲストの種類 +label.specify.IP.ranges=指定したIPの範囲 +label.conserve.mode=モードを節約 +label.created.by.system=システムによって作成され label.menu.system.service.offerings=システムサービスの提供 label.add.system.service.offering=システムサービスの提供を追加します。 -redundant.router.capability=Redundant router capability -supported.source.NAT.type=Supported Source NAT type -elastic.LB=Elastic LB -LB.isolation=LB isolation -elastic.IP=Elastic IP -network.label.display.for.blank.value=デフォルトゲートウェイを使用する -Xen.traffic.label=XenServerのトラフィックのラベル -KVM.traffic.label=KVMトラフィックのラベル -VMware.traffic.label=VMwareのトラフィックのラベル -start.IP=IPアドレスの範囲を起動します。 -end.IP=終了IPアドレスの範囲 -IP.range.is.added=IPアドレスの範囲が追加されました -remove.IP.range=IPアドレス範囲を削除します。 +label.redundant.router.capability=Redundant router capability +label.supported.source.NAT.type=Supported Source NAT type +label.elastic.LB=Elastic LB +label.LB.isolation=LB isolation +label.elastic.IP=Elastic IP +label.network.label.display.for.blank.value=デフォルトゲートウェイを使用する +label.xen.traffic.label=XenServerのトラフィックのラベル +label.kvm.traffic.label=KVMトラフィックのラベル +label.vmware.traffic.label=VMwareのトラフィックのラベル +label.start.IP=IPアドレスの範囲を起動します。 +label.end.IP=終了IPアドレスの範囲 +label.remove.ip.range=IPアドレス範囲を削除します。 storage.traffic.type.is.updated=ストレージ·トラフィック·タイプが更新されます。 management.traffic.type.is.updated=管理トラフィックタイプが更新されます。 public.traffic.type.is.updated=公共交通の種類が更新されます。 diff --git a/ui/index.jsp b/ui/index.jsp index 7a7cd4fe528..67b6a7e34b3 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -2644,32 +2644,30 @@ dictionary = { 'message.add.system.service.offering': '', //Jes 'message.action.delete.system.service.offering': '', 'label.action.delete.system.service.offering': '', -'hypervisor.capabilities': '', -'hypervisor.version': '', -'max.guest.limit': '', -'security.group.enabled': '', -'add.network.offering': '', -'supported.services': '', -'service.capabilities': '', -'guest.type': '', -'specify.IP.ranges': '', -'conserve.mode': '', -'created.by.system': '', +'label.hypervisor.capabilities': '', +'label.hypervisor.version': '', +'label.max.guest.limit': '', +'label.add.network.offering': '', +'label.supported.services': '', +'label.service.capabilities': '', +'label.guest.type': '', +'label.specify.IP.ranges': '', +'label.conserve.mode': '', +'label.created.by.system': '', 'label.menu.system.service.offerings': '', 'label.add.system.service.offering': '', -'redundant.router.capability': '', -'supported.source.NAT.type': '', -'elastic.LB': '', -'LB.isolation': '', -'elastic.IP': '', -'network.label.display.for.blank.value': '', -'Xen.traffic.label': '', -'KVM.traffic.label': '', -'VMware.traffic.label': '', -'start.IP': '', -'end.IP': '', -'IP.range.is.added': '', -'remove.IP.range': '', +'label.redundant.router.capability': '', +'label.supported.source.NAT.type': '', +'label.elastic.LB': '', +'label.LB.isolation': '', +'label.elastic.IP': '', +'label.network.label.display.for.blank.value': '', +'label.xen.traffic.label': '', +'label.kvm.traffic.label': '', +'label.vmware.traffic.label': '', +'label.start.IP': '', +'label.end.IP': '', +'label.remove.ip.range': '', 'storage.traffic.type.is.updated': '', 'management.traffic.type.is.updated': '', 'public.traffic.type.is.updated': '', diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 96fffd58c19..b9d1e1faea6 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -896,14 +896,14 @@ hypervisorCapabilities: { type: 'select', - title: 'hypervisor.capabilities', + title: 'label.hypervisor.capabilities', listView: { id: 'hypervisorCapabilities', - label: 'hypervisor.capabilities', + label: 'label.hypervisor.capabilities', fields: { hypervisor: { label: 'label.hypervisor' }, - hypervisorversion: { label: 'hypervisor.version' }, - maxguestslimit: { label: 'max.guest.limit' } + hypervisorversion: { label: 'label.hypervisor.version' }, + maxguestslimit: { label: 'label.max.guest.limit' } }, dataProvider: function(args) { var array1 = []; @@ -962,14 +962,10 @@ { id: { label: 'label.id' }, hypervisor: { label: 'label.hypervisor' }, - hypervisorversion: { label: 'hypervisor.version' }, + hypervisorversion: { label: 'label.hypervisor.version' }, maxguestslimit: { - label: 'max.guest.limit', + label: 'label.max.guest.limit', isEditable: true - }, - securitygroupenabled: { - label: 'security.group.enabled', - converter: cloudStack.converters.toBooleanText } } ], @@ -1047,10 +1043,10 @@ actions: { add: { - label: 'add.network.offering', + label: 'label.add.network.offering', createForm: { - title: 'add.network.offering', + title: 'label.add.network.offering', preFilter: function(args) { var $availability = args.$form.find('.form-item[rel=availability]'); var $serviceOfferingId = args.$form.find('.form-item[rel=serviceOfferingId]'); @@ -1107,7 +1103,7 @@ }, guestIpType: { - label: 'guest.type', + label: 'label.guest.type', select: function(args) { args.response.success({ data: [ @@ -1131,7 +1127,7 @@ specifyVlan: { label: 'label.specify.vlan', isBoolean: true }, supportedServices: { - label: 'supported.services', + label: 'label.supported.services', dynamic: function(args) { $.ajax({ @@ -1281,14 +1277,14 @@ }, "service.SourceNat.redundantRouterCapabilityCheckbox" : { - label: "redundant.router.capability", + label: "label.redundant.router.capability", isHidden: true, dependsOn: 'service.SourceNat.isEnabled', isBoolean: true }, "service.SourceNat.sourceNatTypeDropdown": { - label: 'supported.source.NAT.type', + label: 'label.supported.source.NAT.type', isHidden: true, dependsOn: 'service.SourceNat.isEnabled', select: function(args) { @@ -1301,13 +1297,13 @@ } }, "service.Lb.elasticLbCheckbox" : { - label: "elastic.LB", + label: "label.elastic.LB", isHidden: true, dependsOn: 'service.Lb.isEnabled', isBoolean: true }, "service.Lb.lbIsolationDropdown": { - label: 'LB.isolation', + label: 'label.LB.isolation', isHidden: true, dependsOn: 'service.Lb.isEnabled', select: function(args) { @@ -1320,7 +1316,7 @@ } }, "service.StaticNat.elasticIpCheckbox" : { - label: "elastic.IP", + label: "label.elastic.IP", isHidden: true, dependsOn: 'service.StaticNat.isEnabled', isBoolean: true @@ -1328,7 +1324,7 @@ //show or hide upon checked services and selected providers above (end) - conservemode: { label: 'conserve.mode', isBoolean: true }, + conservemode: { label: 'label.conserve.mode', isBoolean: true }, tags: { label: 'label.tags' }, @@ -1633,7 +1629,7 @@ }, state: { label: 'label.state' }, guestiptype: { - label: 'guest.type' + label: 'label.guest.type' }, availability: { label: 'label.availability', @@ -1647,7 +1643,7 @@ } }, isdefault: { //created by system by default - label: 'created.by.system', + label: 'label.created.by.system', converter: cloudStack.converters.toBooleanText }, specifyvlan: { @@ -1655,11 +1651,11 @@ converter: cloudStack.converters.toBooleanText }, specifyipranges: { - label: 'specify.IP.ranges', + label: 'label.specify.IP.ranges', converter: cloudStack.converters.toBooleanText }, conservemode: { - label: 'conserve.mode', + label: 'label.conserve.mode', converter: cloudStack.converters.toBooleanText }, networkrate: { @@ -1679,10 +1675,10 @@ label: 'label.traffic.type' }, supportedServices: { - label: 'supported.services' + label: 'label.supported.services' }, serviceCapabilities: { - label: 'service.capabilities' + label: 'label.service.capabilities' } } ], diff --git a/ui/scripts/system.js b/ui/scripts/system.js index c23f38eacad..2b5931f91de 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -25,22 +25,22 @@ }); if(trafficType.xennetworklabel == null || trafficType.xennetworklabel == 0) - trafficType.xennetworklabel = dictionary['network.label.display.for.blank.value']; + trafficType.xennetworklabel = dictionary['label.network.label.display.for.blank.value']; if(trafficType.kvmnetworklabel == null || trafficType.kvmnetworklabel == 0) - trafficType.kvmnetworklabel = dictionary['network.label.display.for.blank.value']; + trafficType.kvmnetworklabel = dictionary['label.network.label.display.for.blank.value']; if(trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0) - trafficType.vmwarenetworklabel = dictionary['network.label.display.for.blank.value']; + trafficType.vmwarenetworklabel = dictionary['label.network.label.display.for.blank.value']; return trafficType; }; var updateTrafficLabels = function(trafficType, labels, complete) { var array1 = []; - if(labels.xennetworklabel != dictionary['network.label.display.for.blank.value']) + if(labels.xennetworklabel != dictionary['label.network.label.display.for.blank.value']) array1.push("&xennetworklabel=" + labels.xennetworklabel); - if(labels.kvmnetworklabel != dictionary['network.label.display.for.blank.value']) + if(labels.kvmnetworklabel != dictionary['label.network.label.display.for.blank.value']) array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel); - if(labels.vmwarenetworklabel != dictionary['network.label.display.for.blank.value']) + if(labels.vmwarenetworklabel != dictionary['label.network.label.display.for.blank.value']) array1.push("&vmwarenetworklabel=" + labels.vmwarenetworklabel); $.ajax({ @@ -308,9 +308,9 @@ broadcastdomaintype: { label: 'label.broadcast.domain.type' } }, { - xennetworklabel: { label: 'Xen.traffic.label', isEditable: true }, - kvmnetworklabel: { label: 'KVM.traffic.label', isEditable: true }, - vmwarenetworklabel: { label: 'VMware.traffic.label', isEditable: true } + xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, + kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, + vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } } ], @@ -346,8 +346,8 @@ 'gateway': { edit: true, label: 'label.gateway' }, 'netmask': { edit: true, label: 'label.netmask' }, 'vlan': { edit: true, label: 'label.vlan', isOptional: true }, - 'startip': { edit: true, label: 'start.IP' }, - 'endip': { edit: true, label: 'end.IP' }, + 'startip': { edit: true, label: 'label.start.IP' }, + 'endip': { edit: true, label: 'label.end.IP' }, 'add-rule': { label: 'label.add', addButton: true } }, add: { @@ -377,7 +377,7 @@ args.response.success({ data: item, notification: { - label: 'IP.range.is.added', + label: 'label.add.ip.range', poll: function(args) { args.complete(); } @@ -393,7 +393,7 @@ }, actions: { destroy: { - label: 'remove.IP.range', + label: 'label.remove.ip.range', action: function(args) { $.ajax({ url: createURL('deleteVlanIpRange&id=' + args.context.multiRule[0].id), @@ -402,7 +402,7 @@ success: function(json) { args.response.success({ notification: { - label: 'remove.IP.range', + label: 'label.remove.ip.range', poll: function(args) { args.complete(); } @@ -456,9 +456,9 @@ broadcastdomaintype: { label: 'label.broadcast.domain.type' } }, { - xennetworklabel: { label: 'Xen.traffic.label', isEditable: true }, - kvmnetworklabel: { label: 'KVM.traffic.label', isEditable: true }, - vmwarenetworklabel: { label: 'VMware.traffic.label', isEditable: true } + xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, + kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, + vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } } ], @@ -508,8 +508,8 @@ }, 'netmask': { edit: true, label: 'label.netmask' }, 'vlan': { edit: true, label: 'label.vlan', isOptional: true }, - 'startip': { edit: true, label: 'start.IP' }, - 'endip': { edit: true, label: 'end.IP' }, + 'startip': { edit: true, label: 'label.start.IP' }, + 'endip': { edit: true, label: 'label.end.IP' }, 'add-rule': { label: 'label.add', addButton: true } }, add: { @@ -536,7 +536,7 @@ jobId: json.createstoragenetworkiprangeresponse.jobid }, notification: { - label: 'IP.range.is.added', + label: 'label.add.ip.range', poll: pollAsyncJobResult } }); @@ -559,7 +559,7 @@ success: function(json) { args.response.success({ notification: { - label: 'remove.IP.range', + label: 'label.remove.ip.range', poll: function(args) { args.complete(); } @@ -613,9 +613,9 @@ broadcastdomaintype: { label: 'label.broadcast.domain.type' } }, { - xennetworklabel: { label: 'Xen.traffic.label', isEditable: true }, - kvmnetworklabel: { label: 'KVM.traffic.label', isEditable: true }, - vmwarenetworklabel: { label: 'VMware.traffic.label', isEditable: true } + xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, + kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, + vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } } ], dataProvider: function(args) { @@ -643,8 +643,8 @@ name: { label: 'label.pod' }, //pod name gateway: { label: 'label.gateway' }, //'Reserved system gateway' is too long and causes a visual format bug (2 lines overlay) netmask: { label: 'label.netmask' }, //'Reserved system netmask' is too long and causes a visual format bug (2 lines overlay) - startip: { label: 'start.IP' }, //'Reserved system start IP' is too long and causes a visual format bug (2 lines overlay) - endip: { label: 'end.IP' } //'Reserved system end IP' is too long and causes a visual format bug (2 lines overlay) + startip: { label: 'label.start.IP' }, //'Reserved system start IP' is too long and causes a visual format bug (2 lines overlay) + endip: { label: 'label.end.IP' } //'Reserved system end IP' is too long and causes a visual format bug (2 lines overlay) }, dataProvider: function(args) { var array1 = []; @@ -743,9 +743,9 @@ }, { tags: { label: 'Tags', isEditable: true }, - xennetworklabel: { label: 'Xen.traffic.label', isEditable: true }, - kvmnetworklabel: { label: 'KVM.traffic.label', isEditable: true }, - vmwarenetworklabel: { label: 'VMware.traffic.label', isEditable: true } + xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, + kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, + vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } } ], dataProvider: function(args) { @@ -810,8 +810,8 @@ }, 'gateway': { edit: true, label: 'label.gateway' }, 'netmask': { edit: true, label: 'label.netmask' }, - 'startip': { edit: true, label: 'start.IP' }, - 'endip': { edit: true, label: 'end.IP' }, + 'startip': { edit: true, label: 'label.start.IP' }, + 'endip': { edit: true, label: 'label.end.IP' }, 'add-rule': { label: 'label.add', addButton: true } }, add: { @@ -835,7 +835,7 @@ args.response.success({ data: item, notification: { - label: 'IP.range.is.added', + label: 'label.add.ip.range', poll: function(args) { args.complete(); } @@ -851,7 +851,7 @@ }, actions: { destroy: { - label: 'remove.IP.range', + label: 'label.remove.ip.range', action: function(args) { $.ajax({ url: createURL('deleteVlanIpRange&id=' + args.context.multiRule[0].id), @@ -860,7 +860,7 @@ success: function(json) { args.response.success({ notification: { - label: 'remove.IP.range', + label: 'label.remove.ip.range', poll: function(args) { args.complete(); } @@ -4543,8 +4543,8 @@ { id: { label: 'label.id' }, netmask: { label: 'label.netmask', isEditable: true }, - startip: { label: 'start.IP', isEditable: true }, - endip: { label: 'end.IP', isEditable: true }, + startip: { label: 'label.start.IP', isEditable: true }, + endip: { label: 'label.end.IP', isEditable: true }, gateway: { label: 'label.gateway', isEditable: true }, allocationstate: { converter: function(str) { @@ -4572,8 +4572,8 @@ id: { label: 'label.id' }, gateway: { label: 'label.gateway' }, netmask: { label: 'label.netmask' }, - startip: { label: 'start.IP' }, - endip: { label: 'end.IP' } + startip: { label: 'label.start.IP' }, + endip: { label: 'label.end.IP' } } ], dataProvider: function(args) { @@ -6402,8 +6402,8 @@ listView: { section: 'guest-IP-range', fields: { - startip: { label: 'start.IP' }, - endip: { label: 'end.IP' } + startip: { label: 'label.start.IP' }, + endip: { label: 'label.end.IP' } }, dataProvider: function(args) { @@ -6460,13 +6460,13 @@ }, 'delete': { - label: 'remove.IP.range' , + label: 'label.remove.ip.range' , messages: { confirm: function(args) { return 'confirm.remove.IP.range'; }, notification: function(args) { - return 'remove.IP.range'; + return 'label.remove.ip.range'; } }, action: function(args) { diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index ee37632b02b..87e5fceb920 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -18,8 +18,8 @@ 'gateway': { edit: true, label: 'label.gateway' }, 'netmask': { edit: true, label: 'label.netmask' }, 'vlanid': { edit: true, label: 'label.vlan', isOptional: true }, - 'startip': { edit: true, label: 'start.IP' }, - 'endip': { edit: true, label: 'end.IP' }, + 'startip': { edit: true, label: 'label.start.IP' }, + 'endip': { edit: true, label: 'label.end.IP' }, 'add-rule': { label: 'label.add', addButton: true } }, add: { @@ -62,8 +62,8 @@ fields: { 'netmask': { edit: true, label: 'label.netmask' }, 'vlanid': { edit: true, label: 'label.vlan', isOptional: true }, - 'startip': { edit: true, label: 'start.IP' }, - 'endip': { edit: true, label: 'end.IP' }, + 'startip': { edit: true, label: 'label.start.IP' }, + 'endip': { edit: true, label: 'label.end.IP' }, 'add-rule': { label: 'label.add', addButton: true } }, add: {