internationalized admin templates

[mir.git] / source / mircoders / servlet / ServletModuleLinksImcs.java

diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java
index 90bc5ce..37cdad2 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleLinksImcs.java
+++ b/source/mircoders/servlet/ServletModuleLinksImcs.java
@@ -37,7 +37,7 @@ public class ServletModuleLinksImcs extends ServletModule
 
 
   private ServletModuleLinksImcs() {
-    theLog = Logfile.getInstance(this.getClass().getName());
+    theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.LinksImcs.Logfile"));
     templateListString = MirConfig.getProp("ServletModule.LinksImcs.ListTemplate");
     templateObjektString = MirConfig.getProp("ServletModule.LinksImcs.ObjektTemplate");
     templateConfirmString = MirConfig.getProp("ServletModule.LinksImcs.ConfirmTemplate");
@@ -62,11 +62,11 @@ public class ServletModuleLinksImcs extends ServletModule
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
       modelRoot.put("new", "1");
-      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
-      modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+      modelRoot.put("parentlist",theParentList);
+      modelRoot.put("languagelist",theLanguageList);
 
       if (theParentList == null || theParentList.getCount() == 0 || theParentList.getCount()>1){
-        HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateObjektString, modelRoot, res.getWriter());
+        HTMLTemplateProcessor.process(res, templateObjektString, modelRoot, res.getWriter(), getLocale(req));
       } else {
         deliver(req, res, modelRoot, templateObjektString);
       }
@@ -77,8 +77,6 @@ public class ServletModuleLinksImcs extends ServletModule
       throw new ServletModuleException(e.toString());
     } catch (IOException e) {
       throw new ServletModuleException(e.toString());
-    } catch(StorageObjectException e) {
-      throw new ServletModuleException(e.toString());
     }
   }
 
@@ -140,9 +138,9 @@ public class ServletModuleLinksImcs extends ServletModule
       theImcsList = mainModule.getByWhereClause(whereClause, "title", (new Integer(offset)).intValue());
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
-      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
-      modelRoot.put("imcslist",HTMLTemplateProcessor.makeSimpleList(theImcsList));
-      modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+      modelRoot.put("parentlist",theParentList);
+      modelRoot.put("imcslist",theImcsList);
+      modelRoot.put("languagelist",theLanguageList);
       modelRoot.put("count", (new Integer(theImcsList.getCount())).toString());
                        modelRoot.put("from", (new Integer(theImcsList.getFrom())).toString());
                        modelRoot.put("to", (new Integer(theImcsList.getTo())).toString());
@@ -151,7 +149,7 @@ public class ServletModuleLinksImcs extends ServletModule
                        if (theImcsList.hasPrevBatch())
                                modelRoot.put("prev", (new Integer(theImcsList.getPrevBatch())).toString());
 
-      HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, modelRoot, res.getWriter());
+      HTMLTemplateProcessor.process(res, templateListString, modelRoot, res.getWriter(), getLocale(req));
 
       } catch (Exception e) {
       throw new ServletModuleException(e.toString());
@@ -172,15 +170,13 @@ public class ServletModuleLinksImcs extends ServletModule
       parentList = mainModule.getByWhereClause("to_parent_id=NULL", "title", offset, 1000);
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
-      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(parentList));
-      modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
-      modelRoot.put("entity", HTMLTemplateProcessor.makeSimpleHash(mainModule.getById(idParam)));
+      modelRoot.put("parentlist",parentList);
+      modelRoot.put("languagelist",theLanguageList);
+      modelRoot.put("entity", mainModule.getById(idParam));
       deliver(req, res, modelRoot, templateObjektString);
 
     } catch(ModuleException e) {
       throw new ServletModuleException(e.toString());
-    } catch(StorageObjectException e) {
-      throw new ServletModuleException(e.toString());
     }
   }