jon 02/05/14 11:34:40
Modified: src/services/org/apache/fulcrum/localization
TurbineLocalizationService.java
Log:
backed out dlr's last change cause it seems that it isn't working.
removed final on this method cause it doesn't make sense to have it
as final.
-jon
Revision Changes Path
1.33 +7 -4
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TurbineLocalizationService.java 2 May 2002 17:18:45 -0000 1.32
+++ TurbineLocalizationService.java 14 May 2002 18:34:40 -0000 1.33
@@ -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.32 2002/05/02 17:18:45 dlr Exp
$
+ * @version $Id: TurbineLocalizationService.java,v 1.33 2002/05/14 18:34:40 jon Exp
$
*/
public class TurbineLocalizationService
extends BaseService
@@ -476,10 +476,13 @@
/**
* @see
org.apache.fulcrum.localization.LocalizationService#getLocale(HttpServletRequest)
*/
- public final Locale getLocale(HttpServletRequest req)
+ public Locale getLocale(HttpServletRequest req)
{
- Locale l = req.getLocale();
- return (l != null ? l : getLocale(req.getHeader(ACCEPT_LANGUAGE)));
+ return getLocale(req.getHeader(ACCEPT_LANGUAGE));
+// (JSS) Backed out this change because Tomcat seems to be returning
+// the wrong result and things just are not working.
+// 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]>
