patrickl 01/12/17 09:34:05
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
SetUpServerAction.java SetUpServiceAction.java
Log:
Correct the following localization problems:
- Make the accented characters conform to the Latin-1 Supplement chart at the
following URL so that they appear correctly on all browsers and platforms:
http://www.unicode.org/charts/PDF/U0080.pdf
- Add the user's current locale as an argument to MessageResources.getMessage()
so that the correct message is loaded instead of the default message.
Revision Changes Path
1.9 +1 -1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationResources_en.properties 2001/12/16 19:40:20 1.8
+++ ApplicationResources_en.properties 2001/12/17 17:34:05 1.9
@@ -38,7 +38,7 @@
service.properties=Service Properties
service.property=Property
service.value=Value
-actions.avaliable.actions=Available Actions
+actions.available.actions=Available Actions
actions.services.create=Create New Service
actions.services.delete=Delete Services
actions.accesslogger.create=Create New Access Logger
1.11 +13 -13
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplicationResources_es.properties 2001/12/16 19:40:20 1.10
+++ ApplicationResources_es.properties 2001/12/17 17:34:05 1.11
@@ -38,21 +38,21 @@
service.properties=Mantenga Las Caracteristicas
service.property=Caracteristica
service.value=Valor
-actions.avaliable.actions=Disponibles Acciones
+actions.available.actions=Disponibles Acciones
actions.services.create=Cree El Nuevo Servicio
-actions.services.delete=Servicios De la Cancelaci\u00dbn
-actions.accesslogger.create=Cree El Maderero Nuevo Del Acceso
-actions.accesslogger.delete=Maderero Del Acceso De la Cancelaci\u00dbn
+actions.services.delete=Servicios de la Cancelaci\u00f3n
+actions.accesslogger.create=Cree El Maderero Nuevo del Acceso
+actions.accesslogger.delete=Maderero del Acceso de la Cancelaci\u00f3n
actions.connector.create=Cree Nuevo El Conector
-actions.connector.delete=Conectores De la Cancelaci\u00dbn
+actions.connector.delete=Conectores de la Cancelaci\u00f3n
actions.host.create=Cree El Nuevo Ordenador principal
-actions.host.delete=Ordenadores principal De la Cancelaci\u00dbn
+actions.host.delete=Ordenadores principal de la Cancelaci\u00f3n
actions.logger.create=Cree Nuevo El Maderero
-actions.logger.delete=Madereros De la Cancelaci\u00dbn
-actions.requestfilter.create=Cree El Filtro Nuevo De la Petici\u00dbn
-actions.requestfilter.delete=Filtros De la Petici\u00dbn De la Cancelaci\u00dbn
-actions.userrealm.create=Cree El Nuevo Reino Del Utilizador
-actions.userrealm.delete=Reinos Del Utilizador De la Cancelaci\u00dbn
-actions.valve.create=Cree Nueva La V\u00b7lvula
-actions.valve.delete=V\u00b7lvulas De la Cancelaci\u00dbn
+actions.logger.delete=Madereros de la Cancelaci\u00f3n
+actions.requestfilter.create=Cree El Filtro Nuevo de la Petici\u00f3n
+actions.requestfilter.delete=Filtros de la Petici\u00f3n de la Cancelaci\u00f3n
+actions.userrealm.create=Cree El Nuevo Reino del Utilizador
+actions.userrealm.delete=Reinos del Utilizador de la Cancelaci\u00f3n
+actions.valve.create=Cree Nueva La V\u00e1lvula
+actions.valve.delete=V\u00e1lvulas de la Cancelaci\u00f3n
actions.service.delete=Suprima este servicio
1.4 +10 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java
Index: SetUpServerAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetUpServerAction.java 2001/12/16 19:40:20 1.3
+++ SetUpServerAction.java 2001/12/17 17:34:05 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
1.3 2001/12/16 19:40:20 patrickl Exp $
- * $Revision: 1.3 $
- * $Date: 2001/12/16 19:40:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
1.4 2001/12/17 17:34:05 patrickl Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/12/17 17:34:05 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
*
* @author Jazmin Jonson
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2001/12/16 19:40:20 $
+ * @version $Revision: 1.4 $ $Date: 2001/12/17 17:34:05 $
*/
public class SetUpServerAction extends Action {
@@ -135,8 +135,9 @@
HttpServletResponse response)
throws IOException, ServletException {
- // Do I have to do this part ??
+ HttpSession session = request.getSession();
+ // Do I have to do this part ??
if (form == null) {
getServlet().log(" Creating new ServerForm bean under key "
+ mapping.getAttribute());
@@ -150,6 +151,7 @@
}
MessageResources messages = getResources();
+ Locale locale = (Locale)session.getAttribute(Action.LOCALE_KEY);
// Do transaction stuff before this
@@ -175,15 +177,15 @@
actionList = new ArrayList();
// You can get this from the Mbean
actionList.add(new LabelValueBean(
- messages.getMessage("actions.avaliable.actions"),
+ messages.getMessage(locale, "actions.available.actions"),
"Available Actions"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.services.create"),
+ messages.getMessage(locale, "actions.services.create"),
"Create New Service"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.services.delete"),
+ messages.getMessage(locale, "actions.services.delete"),
"Delete Services"));
}
1.3 +24 -21
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java
Index: SetUpServiceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetUpServiceAction.java 2001/12/16 19:40:20 1.2
+++ SetUpServiceAction.java 2001/12/17 17:34:05 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java,v
1.2 2001/12/16 19:40:20 patrickl Exp $
- * $Revision: 1.2 $
- * $Date: 2001/12/16 19:40:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java,v
1.3 2001/12/17 17:34:05 patrickl Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/12/17 17:34:05 $
*
* ====================================================================
*
@@ -99,7 +99,7 @@
* page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2001/12/16 19:40:20 $
+ * @version $Revision: 1.3 $ $Date: 2001/12/17 17:34:05 $
*/
public class SetUpServiceAction extends Action {
@@ -139,6 +139,8 @@
HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
+
+ HttpSession session = request.getSession();
if (form == null) {
getServlet().log(" Creating new ServiceForm bean under key "
@@ -148,12 +150,13 @@
if ("request".equals(mapping.getScope()))
request.setAttribute(mapping.getAttribute(), form);
else
- request.getSession().setAttribute(mapping.getAttribute(), form);
+ session.setAttribute(mapping.getAttribute(), form);
}
// The message resources for this package.
MessageResources messages = getResources();
+ Locale locale = (Locale)session.getAttribute(Action.LOCALE_KEY);
String selectedName = request.getParameter("select");
@@ -179,67 +182,67 @@
actionList = new ArrayList();
// You can get this from the Mbean
actionList.add(new LabelValueBean(
- messages.getMessage("actions.avaliable.actions"),
+ messages.getMessage(locale, "actions.available.actions"),
"Available Actions"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.accesslogger.create"),
+ messages.getMessage(locale, "actions.accesslogger.create"),
"Create New Access Logger"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.accesslogger.delete"),
+ messages.getMessage(locale, "actions.accesslogger.delete"),
"Delete Access Logger"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.connector.create"),
+ messages.getMessage(locale, "actions.connector.create"),
"Create New Connector"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.connector.delete"),
+ messages.getMessage(locale, "actions.connector.delete"),
"Delete Connectors..."));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.host.create"),
+ messages.getMessage(locale, "actions.host.create"),
"Create New Host"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.host.delete"),
+ messages.getMessage(locale, "actions.host.delete"),
"Delete Hosts"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.logger.create"),
+ messages.getMessage(locale, "actions.logger.create"),
"Create New Logger"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.logger.delete"),
+ messages.getMessage(locale, "actions.logger.delete"),
"Delete Logger"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.requestfilter.create"),
+ messages.getMessage(locale, "actions.requestfilter.create"),
"Create New Request Filter"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.requestfilter.delete"),
+ messages.getMessage(locale, "actions.requestfilter.delete"),
"Delete Request Filters"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.userrealm.create"),
+ messages.getMessage(locale, "actions.userrealm.create"),
"Create New User Realm"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.userrealm.delete"),
+ messages.getMessage(locale, "actions.userrealm.delete"),
"Delete User Realm"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.valve.create"),
+ messages.getMessage(locale, "actions.valve.create"),
"Create New Valve"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.valve.delete"),
+ messages.getMessage(locale, "actions.valve.delete"),
"Delete Valves"));
actionList.add(new LabelValueBean(
- messages.getMessage("actions.service.delete"),
+ messages.getMessage(locale, "actions.service.delete"),
"Delete This Service"));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
