From dae909aaf887dc9e90d02f32015c02e722b29a02 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 9 Feb 2011 13:59:58 -0800 Subject: [PATCH] Add Pool Dialog - localize protocol values in dropdown. --- .../classes/resources/messages.properties | 4 ++- .../classes/resources/messages_es.properties | 2 +- .../classes/resources/messages_ja.properties | 2 +- .../resources/messages_zh_CN.properties | 2 +- ui/index.jsp | 8 ++++- ui/jsp/cluster.jsp | 5 +--- ui/jsp/pod.jsp | 5 +--- ui/jsp/primarystorage.jsp | 5 +--- ui/jsp/resource.jsp | 5 +--- ui/jsp/zone.jsp | 5 +--- ui/scripts/cloud.core.resource.js | 29 +++++++++++-------- 11 files changed, 35 insertions(+), 37 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 6561255b2fe..ca72cfcab27 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1,4 +1,6 @@ #New - Add all new parameters here. +label.PreSetup=PreSetup +label.VMFS.datastore=VMFS datastore #Labels label.SR.name = SR Name-Label @@ -482,7 +484,7 @@ label.sent=Sent label.server=Server label.service.offering=Service Offering label.shared=Shared -label.sharedMountPoint=sharedMountPoint +label.SharedMountPoint=SharedMountPoint label.size=Size label.snapshot.limits=Snapshot Limits label.snapshot.name=Snapshot Name diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties index 245567aec99..39da49c115c 100644 --- a/client/WEB-INF/classes/resources/messages_es.properties +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -480,7 +480,7 @@ label.sent = Enviados label.server = Servidor label.service.offering = Oferta de Servicio label.shared = compartidas -label.sharedMountPoint = sharedMountPoint +label.SharedMountPoint = SharedMountPoint label.size = Tamaño label.snapshot = Instantánea label.snapshot.limits = instantáneas Límites diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 90340d63990..003f76299cf 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -480,7 +480,7 @@ label.sent =送信 label.server =サーバ label.service.offering =サービスオファリング label.shared =共有 -label.sharedMountPoint = sharedMountPoint +label.SharedMountPoint = SharedMountPoint label.size =サイズ label.snapshot =スナップショット label.snapshot.limits =スナップショット制限 diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 6c7bd669369..9a454404628 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -479,7 +479,7 @@ label.sent =发送 label.server =服务 label.service.offering =服务Offering label.shared =共享 -label.sharedMountPoint = sharedMountPoint +label.SharedMountPoint = SharedMountPoint label.size =大小 label.snapshot =快照 label.snapshot.limits =快照限制 diff --git a/ui/index.jsp b/ui/index.jsp index bd93164ae61..25669c564fe 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -87,7 +87,13 @@ 'label.by.domain': '', 'label.by.account': '', 'label.path': '', - 'label.SR.name': '' + 'label.SR.name': '', + + 'label.nfs': '', + 'label.SharedMountPoint': '', + 'label.PreSetup': '', + 'label.iscsi': '', + 'label.VMFS.datastore': '' }; diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp index ed9a6b6917c..813164fbecd 100644 --- a/ui/jsp/cluster.jsp +++ b/ui/jsp/cluster.jsp @@ -263,10 +263,7 @@ dictionary = {
  • -
  • diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp index 6d5b230404b..9c60c3b1d7b 100644 --- a/ui/jsp/pod.jsp +++ b/ui/jsp/pod.jsp @@ -475,10 +475,7 @@ dictionary = {
  • -
  • diff --git a/ui/jsp/primarystorage.jsp b/ui/jsp/primarystorage.jsp index 2fc92847f70..975471d963a 100644 --- a/ui/jsp/primarystorage.jsp +++ b/ui/jsp/primarystorage.jsp @@ -239,10 +239,7 @@ dictionary = {
  • -
  • diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp index e46a2158db9..688a7702703 100644 --- a/ui/jsp/resource.jsp +++ b/ui/jsp/resource.jsp @@ -972,10 +972,7 @@
  • -
  • diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp index eb06a31ab4d..496a70289e0 100644 --- a/ui/jsp/zone.jsp +++ b/ui/jsp/zone.jsp @@ -548,10 +548,7 @@ dictionary = {
  • -
  • diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index 23a45b67854..a72ce445081 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -1624,24 +1624,29 @@ function bindAddPrimaryStorageDialog($dialog) { return false; var $protocolSelector = $dialog.find("#add_pool_protocol"); - var objCluster = clustersUnderPod['cluster_'+curOption]; + var clusterObj = clustersUnderPod['cluster_'+curOption]; - if(objCluster == null) + if(clusterObj == null) return; - if(objCluster.hypervisortype == "KVM") { + if(clusterObj.hypervisortype == "KVM") { $protocolSelector.empty(); - $protocolSelector.append(''); - $protocolSelector.append(''); - } else if(objCluster.hypervisortype == "XenServer") { + $protocolSelector.append(''); + $protocolSelector.append(''); + } + else if(clusterObj.hypervisortype == "XenServer") { $protocolSelector.empty(); - $protocolSelector.append(''); - $protocolSelector.append(''); - $protocolSelector.append(''); - } else if(objCluster.hypervisortype == "VMware") { + $protocolSelector.append(''); + $protocolSelector.append(''); + $protocolSelector.append(''); + } + else if(clusterObj.hypervisortype == "VMware") { $protocolSelector.empty(); - $protocolSelector.append(''); - $protocolSelector.append(''); + $protocolSelector.append(''); + $protocolSelector.append(''); + } + else { + $protocolSelector.empty(); } $protocolSelector.change();