merge of localization branch into HEAD. mh and zap

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 8a8bb9a..c553363 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -25,7 +25,7 @@ import mircoders.storage.*;
 
 
 public class OpenMir extends AbstractServlet {
-  
+
   //private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
@@ -49,9 +49,17 @@ public class OpenMir extends AbstractServlet {
     session = req.getSession();
 
     if(session.getAttribute("Language")==null){
-      setLanguage(session,getAcceptLanguage(req));
+      if (req.getParameter("language")!=null) {
+        setLanguage(session, req.getParameter("language"));
+      }
+      else {
+        setLanguage(session, getAcceptLanguage(req));
+      }
     }
 
+    if (req.getParameter("language")!=null)
+      setLocale(session, new Locale(req.getParameter("language"), "") );
+
     res.setContentType("text/html; charset="
                       +MirConfig.getProp("Mir.DefaultEncoding"));
     try {
@@ -70,14 +78,14 @@ public class OpenMir extends AbstractServlet {
   }
 
   private void handleUserError(HttpServletRequest req, HttpServletResponse res,
-                                                                                                                        PrintWriter out, String errorString) {
+                               PrintWriter out, String errorString) {
     try {
       theLog.printError(errorString);
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
       HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.UserErrorTemplate"),
-                                                                                                                                               modelRoot, out, req.getLocale() );
+                                    modelRoot, out, req.getLocale() );
       out.close();
     }
     catch (Exception e) {
@@ -93,9 +101,9 @@ public class OpenMir extends AbstractServlet {
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(
-                                                                                                                                                                                        new GregorianCalendar())));
+                                               new GregorianCalendar())));
       HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),
-                                                                                                                                               modelRoot,out, req.getLocale());
+                                    modelRoot,out, req.getLocale());
       out.close();
     }
     catch (Exception e) {