bug fixes

diff --git a/source/default.properties b/source/default.properties
index 09ee4c8..4624f68 100755 (executable)
--- a/source/default.properties
+++ b/source/default.properties
@@ -406,6 +406,9 @@ Localizer.OpenSession.comment.DoneTemplate = donecomment.template
 Localizer.OpenSession.comment.UnsupportedMediaTemplate = unsupportedmediatype.template
 Localizer.OpenSession.ErrorTemplate = sessionerror.template
 
+Localizer.OpenSession.email.PrepareTemplate = preparemail.template
+Localizer.OpenSession.email.MailTemplate = email_article.template
+Localizer.OpenSession.email.DoneTemplate =/sent_mail.template
 
 
 

diff --git a/source/mircoders/localizer/basic/MirBasicEmailArticleHandler.java b/source/mircoders/localizer/basic/MirBasicEmailArticleHandler.java
index 17549ce..fc1c540 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicEmailArticleHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicEmailArticleHandler.java
@@ -196,13 +196,13 @@ public class MirBasicEmailArticleHandler implements SessionHandler {
        
        Generator generator = MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(emailAnArticleTemplate);
        
-       StringWriter theEmailTextWriter = new StringWriter();
+       StringWriter theEmailStringWriter = new StringWriter();
+       PrintWriter theEmailPrintWriter = new PrintWriter(theEmailStringWriter);
+       generator.generate(theEmailPrintWriter, responseData, logger);
        
-       generator.generate(theEmailTextWriter, responseData, logger);
-       
-       theEmailTextWriter.close();
+       theEmailStringWriter.close();
 
-       theText = theEmailTextWriter.toString();
+       theText = theEmailStringWriter.toString();
        MirGlobal.mruCache().storeObject(theCacheKey, theText);
       }
       catch (Throwable e) {
@@ -284,7 +284,7 @@ public class MirBasicEmailArticleHandler implements SessionHandler {
     String language=aRequest.getParameter("mail_language");
     String comment=aRequest.getParameter("mail_comment");
     
-    String theEmailText=getEmailText(aid,language);
+    String theEmailText=getEmailText((String) aSession.getAttribute("email.aid"),language);
     String headers=getExtraEmailHeaders(aRequest,to,from);
     theEmailText=interpolateComment(theEmailText,comment,from_name,language);
     String message=headers+"\n"+theEmailText;