dlr 02/05/02 10:18:46
Modified: src/services/org/apache/fulcrum/localization
TurbineLocalizationService.java
Log:
First try the servlet container's implementation of getLocale() in the
getLocale(HttpServletRequest) method.
Revision Changes Path
1.32 +3 -2
jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/org/apache/fulcrum/localization/TurbineLocalizationService.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -u -r1.31 -r1.32
--- TurbineLocalizationService.java 9 Apr 2002 21:50:14 -0000 1.31
+++ TurbineLocalizationService.java 2 May 2002 17:18:45 -0000 1.32
@@ -97,7 +97,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leonard Richardson</a>
- * @version $Id: TurbineLocalizationService.java,v 1.31 2002/04/09 21:50:14 dlr Exp
$
+ * @version $Id: TurbineLocalizationService.java,v 1.32 2002/05/02 17:18:45 dlr Exp
$
*/
public class TurbineLocalizationService
extends BaseService
@@ -478,7 +478,8 @@
*/
public final Locale getLocale(HttpServletRequest req)
{
- return getLocale(req.getHeader(ACCEPT_LANGUAGE));
+ Locale l = req.getLocale();
+ return (l != null ? l : getLocale(req.getHeader(ACCEPT_LANGUAGE)));
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
