Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 72360 invoked from network); 13 Jan 2009 15:48:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Jan 2009 15:48:56 -0000 Received: (qmail 5191 invoked by uid 500); 13 Jan 2009 15:48:56 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 5054 invoked by uid 500); 13 Jan 2009 15:48:56 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 5045 invoked by uid 99); 13 Jan 2009 15:48:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2009 07:48:55 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2009 15:48:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B344F2388988; Tue, 13 Jan 2009 07:48:34 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090113154834.B344F2388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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(); -%> - + <%@ 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(); -%> - + 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"%> + 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"%> +