If Mir.Login.DefaulLanguage is _empty_ then set the default to the browsers current...

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 595696f..263c4cd 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -65,8 +65,8 @@ import mircoders.storage.DatabaseUsers;
 /**\r
  * Mir.java - main servlet, that dispatches to servletmodules\r
  *\r
- * @author $Author: zapata $\r
- * @version $Id: Mir.java,v 1.24 2002/12/17 19:20:31 zapata Exp $\r
+ * @author $Author: mh $\r
+ * @version $Id: Mir.java,v 1.25 2002/12/23 03:00:11 mh Exp $\r
  *\r
  */\r
 \r
@@ -149,14 +149,11 @@ public class Mir extends AbstractServlet {
     else\r
       http = "http";\r
 \r
-    //nothing in Mir can or should be cached as it's all dynamic...\r
-    //\r
-    //this needs to be done here and not per page (via meta tags) as some\r
-    //browsers have problems w/ it per-page -mh\r
-    res.setHeader("Pragma", "no-cache");\r
-    res.setDateHeader("Expires", 0);\r
-    res.setHeader("Cache-Control", "no-cache");\r
-    res.setContentType("text/html; charset=" + MirConfig.getProp("Mir.DefaultEncoding"));\r
+\r
+    //make sure client browsers don't cache anything\r
+    setNoCaching(res);\r
+\r
+    res.setContentType("text/html; charset=" + MirConfig.getProp("Mir.DefaultHTMLCharset"));\r
 \r
     String moduleName = req.getParameter("module");\r
     checkLanguage(session, req);\r
@@ -387,7 +384,10 @@ public class Mir extends AbstractServlet {
 \r
       mergeData.put("session", sessionUrl);\r
 \r
-      mergeData.put("defaultlanguage", MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "en"));\r
+      String defaultlanguage = MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "");\r
+      if (defaultlanguage.length() == 0)\r
+        defaultlanguage = req.getLocale().getLanguage();\r
+      mergeData.put("defaultlanguage",  defaultlanguage);\r
       mergeData.put("languages", getLoginLanguages());\r
 \r
       HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out, getLocale(req));\r