From 155100a5fe3190ae5bde4578c6a3473b8c22e731 Mon Sep 17 00:00:00 2001 From: will Date: Tue, 25 Jan 2011 18:08:28 -0800 Subject: [PATCH] bug 4556: localized string replacement for resource.jsp --- .../classes/resources/messages.properties | 26 ++ ui/jsp/resource.jsp | 289 +++++++++--------- 2 files changed, 165 insertions(+), 150 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 755a0810d08..efed75a0089 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -274,6 +274,16 @@ label.by.traffic.type=By Traffic Type label.private.ip.range=Private IP Range label.cloud.managed=Cloud.com Managed label.vsphere.managed=vSphere Managed +label.update.ssl=Update SSL Certificate +label.basic.mode=Basic Mode +label.advanced.mode=Advanced Mode +label.internal.dns.1=Internal DNS 1 +label.internal.dns.2=Internal DNS 2 +label.vlan.range=VLAN Range +label.reserved.system.ip=Reserved System IP +label.certificate=Certificate +label.updating=Updating +label.resource=Resource label.lang.english=English label.lang.chinese=Chinese @@ -333,6 +343,10 @@ label.go.step.2=Go to Step 2 label.go.step.3=Go to Step 3 label.go.step.4=Go to Step 4 label.go.step.5=Go to Step 5 +label.zone.step.1.title=Step 1: Select a Network +label.zone.step.2.title=Step 2: Add a Zone +label.zone.step.3.title=Step 3: Add a Pod +label.zone.step.4.title=Step 4: Add an IP range label.vm.add=Add VM label.vm.start=Start VM @@ -383,8 +397,20 @@ message.add.ip.range.direct.network=Add an IP range to direct network message.add.host=Add a host for zone , pod message.add.cluster=Add a hypervisor managed cluster for zone , pod +message.add.cluster.zone=Add a hypervisor managed cluster for zone message.add.primary.storage=Add a new Primary Storage for zone , pod message.add.ip.range.to.pod=

Add an IP range to pod:

+message.number.zones=

# of Zones

+message.number.pods=

# of Pods

+message.number.clusters=

# of Clusters

+message.number.hosts=

# of Host

+message.number.storage=

# of Primary Storage

+message.zone.step.1.desc=Please select a network model for your zone. +message.zone.step.2.desc=Please enter the following info to add a new zone +message.zone.step.3.desc=Please enter the following info to add a new pod +message.basic.mode.desc=Choose this network model if you do *not* want to enable any VLAN support. All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation. +message.advanced.mode.desc=Choose this network model if you wish to enable VLAN support. This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking. +message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance: #Errors error.login=Your username/password does not match our records. diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp index b4f0ab3987d..b859b6c7558 100644 --- a/ui/jsp/resource.jsp +++ b/ui/jsp/resource.jsp @@ -1,17 +1,15 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> + + + +

- Resource +

@@ -25,7 +23,7 @@
-

# of Zones

+
@@ -40,7 +38,7 @@
-

# of Pods

+
@@ -56,7 +54,7 @@
-

# of Clusters

+
@@ -72,8 +70,7 @@
-

# of Host

- +
@@ -89,8 +86,7 @@
-

# of Primary Storage

- +
@@ -113,7 +109,7 @@
Add Zone
- Add Zone +
@@ -122,7 +118,7 @@
Update SSL Certificate
- Update SSL Certificate +
@@ -137,13 +133,13 @@
- Step 1
+
- Step 2
+
- Step 3
+
- Step 4
+
@@ -153,9 +149,10 @@

- Step 1: Select a Network

+ +

- Please select a network model for your zone. +

@@ -164,13 +161,13 @@
+

- Choose this network model if you do *not* want to enable any VLAN support. All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation. +

@@ -178,13 +175,13 @@
+
-

- Choose this network model if you wish to enable VLAN support. This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking. +

+

@@ -193,7 +190,7 @@
- Go to Step 2
+
@@ -206,13 +203,13 @@
- Step 3
+
- Step 4
+
@@ -222,9 +219,10 @@

- Step 2: Add a Zone

+ +

- Please enter the following info to add a new zone +

@@ -232,32 +230,32 @@
  1. - +
  2. - +
  3. - +
  4. - +
  5. - +
  6. - + - @@ -269,16 +267,16 @@
  7. - +
    8. @@ -290,10 +288,10 @@
- Back +
- Go to Step 3
+
@@ -306,13 +304,13 @@
- Step 3
+
- Step 4
+
@@ -321,10 +319,11 @@
-

- Step 3: Add a Pod

+

+ +

- Please enter the following info to add a new pod +

@@ -333,28 +332,28 @@
  1. + :
  2. + :
  3. + :
  4. + : -
    - Back +
    - Go to Step 4
    +
@@ -384,13 +383,13 @@
- Step 3
+
- Step 4
+
@@ -400,7 +399,8 @@

- Step 4: Add an IP range

+ +

@@ -410,7 +410,7 @@
  1. + : -
  2. + :
  3. + : @@ -436,7 +436,7 @@