i18n-feature based on kellans proposal implemented. the resource-bundles are located...

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

diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java
index 3c1c6e4..5478e20 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleComment.java
+++ b/source/mircoders/servlet/ServletModuleComment.java
@@ -9,15 +9,15 @@ import javax.servlet.http.*;
 
 import freemarker.template.*;
 
-import webdb.servlet.*;
-import webdb.module.*;
-import webdb.misc.*;
-import webdb.entity.*;
-import webdb.storage.*;
-
+import mir.servlet.*;
+import mir.module.*;
+import mir.misc.*;
 import mir.entity.*;
 import mir.storage.*;
-import mir.module.*;
+
+import mir.entity.*;
+import mircoders.storage.*;
+import mircoders.module.*;
 
 /*
  *  ServletModuleComment - controls navigation for Comments
@@ -36,10 +36,10 @@ public class ServletModuleComment extends ServletModule
        public static ServletModule getInstance() { return instance; }
 
        private ServletModuleComment() {
-               theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.Comment.Logfile"));
-               templateListString = Configuration.getProperty("ServletModule.Comment.ListTemplate");
-               templateObjektString = Configuration.getProperty("ServletModule.Comment.ObjektTemplate");
-               templateConfirmString = Configuration.getProperty("ServletModule.Comment.ConfirmTemplate");
+               theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("ServletModule.Comment.Logfile"));
+               templateListString = MirConfig.getProp("ServletModule.Comment.ListTemplate");
+               templateObjektString = MirConfig.getProp("ServletModule.Comment.ObjektTemplate");
+               templateConfirmString = MirConfig.getProp("ServletModule.Comment.ConfirmTemplate");
                try {
                        mainModule = new ModuleComment(DatabaseComment.getInstance());
                        moduleContent = new ModuleContent(DatabaseContent.getInstance());
@@ -92,7 +92,7 @@ public class ServletModuleComment extends ServletModule
 
                                if (query_text!=null || query_is_published!=null ) {
                                        EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue());
-                                       if (theList!=null) {
+                                       if (theList!=null && theList.size()>0) {
 
                                                //make articleHash for comment
                                                StringBuffer buf= new StringBuffer("id in (");boolean first=true;
@@ -117,7 +117,8 @@ public class ServletModuleComment extends ServletModule
                                        }
                                }
                                // raus damit
-                               HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
+                               HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString,
+                                                                                                                                                       mergeData, res.getWriter(), req.getLocale());
                        }
                        catch (ModuleException e) {throw new ServletModuleException(e.toString());}
                        catch (IOException e) {throw new ServletModuleException(e.toString());}