dgraham 2003/07/25 17:19:45 Modified: src/share/org/apache/struts/util RequestUtils.java Log: Added getUserLocale() that accepts an HttpServletRequest object instead of a JSP specific PageContext object. Revision Changes Path 1.113 +19 -6 jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java Index: RequestUtils.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- RequestUtils.java 25 Jul 2003 09:15:57 -0000 1.112 +++ RequestUtils.java 26 Jul 2003 00:19:44 -0000 1.113 @@ -967,8 +967,21 @@ * @return current user locale */ public static Locale retrieveUserLocale(PageContext pageContext, String locale) { + return getUserLocale((HttpServletRequest) pageContext.getRequest(), locale); + } + + /** + * Look up and return current user locale, based on the specified parameters. + * + * @param request The request used to lookup the Locale + * @param locale Name of the session attribute for our user's Locale. If this is + * <code>null</code>, the default locale key is used for the lookup. + * @return current user locale + * @since Struts 1.2 + */ + public static Locale getUserLocale(HttpServletRequest request, String locale) { Locale userLocale = null; - HttpSession session = pageContext.getSession(); + HttpSession session = request.getSession(false); if (locale == null) { locale = Globals.LOCALE_KEY; @@ -981,7 +994,7 @@ if (userLocale == null) { // Returns Locale based on Accept-Language header or the server default - userLocale = pageContext.getRequest().getLocale(); + userLocale = request.getLocale(); } return userLocale;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]