geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r734161 - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/resources/ console/console-base-portlets/src/main/resources/ console/console-core/src/main/java/org/apache/geronimo/console/ console/console-portal-driver/src/...
Date Tue, 13 Jan 2009 15:48:15 GMT
Author: dwoods
Date: Tue Jan 13 07:47:25 2009
New Revision: 734161

URL: http://svn.apache.org/viewvc?rev=734161&view=rev
Log:
GERONIMO-4507 Admin console should honor the priority of user agent's language setting.  Applied
locale-priority_fix.patch from Gang Yin.

Removed:
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/activemq_en.properties
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/jms-resource-providers_en.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_en.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/jms-resource-providers_zh.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips_en.properties
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_en.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_en.properties
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/debugviews_en.properties
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/monitor-portlet_en.properties
    geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/resources/openejb-portlet_en.properties
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet_en.properties
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/systemdatabase_en.properties
Modified:
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp

Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java?rev=734161&r1=734160&r2=734161&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
Tue Jan 13 07:47:25 2009
@@ -53,6 +53,7 @@
     protected final static String WEB_SERVER_TOMCAT = "tomcat";
     protected final static String WEB_SERVER_GENERIC = "generic";
     private static final String COMMON_MESSAGES = "commonMessages";
+    private static final String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale.request";
 
     protected final static String getWebServerType(Class cls) {
         Class[] intfs = cls.getInterfaces();
@@ -139,6 +140,8 @@
         }
         request.getPortletSession().removeAttribute(COMMON_MESSAGES);
 
+        request.setAttribute(FMT_LOCALE, request.getLocale());
+        
         super.render(request, response);
     }
 

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=734161&r1=734160&r2=734161&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
Tue Jan 13 07:47:25 2009
@@ -19,10 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
-<%
-    String localeName = pageContext.getRequest().getLocale().getLanguage();
-%> 
-<fmt:setLocale value="<%=localeName%>"/>
+<fmt:setLocale value="<%=request.getLocale().getLanguage()%>"/>
 <fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
 <%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.pluto.driver.services.portal.PageConfig"
%>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=734161&r1=734160&r2=734161&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
Tue Jan 13 07:47:25 2009
@@ -19,10 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
-<%
-    String localeName = pageContext.getRequest().getLocale().getLanguage();
-%> 
-<fmt:setLocale value="<%=localeName%>"/>
+<fmt:setLocale value="<%=request.getLocale().getLanguage()%>"/>
 <fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
 <!-- Use pluto portlet tag to render the portlet -->

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp?rev=734161&r1=734160&r2=734161&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/login.jsp
Tue Jan 13 07:47:25 2009
@@ -20,6 +20,7 @@
 <%-- $Rev$ $Date$ --%>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setLocale value="<%=request.getLocale().getLanguage()%>"/>
 <fmt:setBundle basename="portaldriver"/>
 
 <html>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=734161&r1=734160&r2=734161&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
Tue Jan 13 07:47:25 2009
@@ -20,6 +20,7 @@
 <%@ page language="java" 
          contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setLocale value="<%=request.getLocale().getLanguage()%>"/>
 <fmt:setBundle basename="portaldriver"/> 
 
 <html>



Mime
View raw message