Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java,v
diff -u -r1.13 -r1.14
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	30 Jun 2006 06:58:37 -0000	1.13
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	11 Jul 2006 05:45:45 -0000	1.14
@@ -53,7 +53,7 @@
 	
 	//	private static final String DEFAULT_LANGUAGE = "en";
 //	private static final String DEFUALT_COUNTRY = "AU";
-	private static final String PREFERRED_LOCALE_KEY = "org.apache.struts.action.LOCALE";
+	public static final String PREFERRED_LOCALE_KEY = "org.apache.struts.action.LOCALE";
 	/**
 	 * Set the encoding to use for requests. This encoding will be
 	 * passed into a ServletRequest.setCharacterEncoding call.
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java	3 Apr 2006 23:36:55 -0000	1.4
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/HttpSessionManager.java	11 Jul 2006 05:45:45 -0000	1.5
@@ -25,17 +25,20 @@
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Enumeration;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.jsp.jstl.core.Config;
 
 import org.apache.log4j.Logger;
 
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.web.filter.LocaleFilter;
 
 
 /**
@@ -153,6 +156,16 @@
 		HttpSession session= se.getSession();
 		session.setMaxInactiveInterval(timeout);
 		context = session.getServletContext();
+		
+        //set server default locale for STURTS and JSTL. This value should be overwrite 
+		//LocaleFilter class. But this part code can cope with login.jsp Locale.
+        if (session != null) {
+        	Locale preferredLocale = new Locale(Configuration.get(ConfigurationKeys.SERVER_LANGUAGE));
+            if (preferredLocale != null) {
+                session.setAttribute(LocaleFilter.PREFERRED_LOCALE_KEY, preferredLocale);
+                Config.set(session, Config.FMT_LOCALE, preferredLocale);
+            }
+        }		
 	}
 }