svn commit: [jahia] r17969 - /trunk/core/src/java/org/jahia/services/mail/GroovyMimeMessagePreparator.java

[cmailleux]

Author: cmailleux
Date: Thu Jul 12 17:12:05 2007
New Revision: 17969

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17969&repname=
=3Djahia
Log:
Port of commit [17027] Use encoding define in jahia.properties for default =
output encoding

Modified:
    trunk/core/src/java/org/jahia/services/mail/GroovyMimeMessagePreparator=
.java

Modified: trunk/core/src/java/org/jahia/services/mail/GroovyMimeMessagePrep=
arator.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/mail/GroovyMimeMessagePreparator.java&rev=3D17969&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/mail/GroovyMimeMessagePreparator=
.java (original)
+++ trunk/core/src/java/org/jahia/services/mail/GroovyMimeMessagePreparator=
.java Thu Jul 12 17:12:05 2007
@@ -25,6 +25,7 @@
 =

 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.mail.javamail.MimeMessagePreparator;
+import org.jahia.bin.Jahia;
 import groovy.util.GroovyScriptEngine;
 import groovy.lang.Binding;
 import groovy.lang.MissingPropertyException;
@@ -60,12 +61,16 @@
             // create wrapper multipart/alternative part
             MimeMultipart ma =3D new MimeMultipart("alternative");
             msg.setContent(ma);
+            //charset should be specified in jahia.props to support exotic=
 languages
+            final String charset =3D "charset=3D"+Jahia.getSettings().getD=
efaultResponseBodyEncoding().toLowerCase();
 =

             String textBody =3D (String) binding.getVariable("textBody");
             if (textBody !=3D null) {
                 // create the plain text
                 BodyPart plainText =3D new MimeBodyPart();
-                plainText.setText(textBody);
+
+                plainText.setContent(textBody,"text/plain; "+charset);
+                //logger.debug("plain text message part=3D"+ plainText.get=
Content());
                 ma.addBodyPart(plainText);
             }
 =

@@ -75,11 +80,12 @@
                 MimeBodyPart html =3D new MimeBodyPart();
                 html.setDataHandler(new DataHandler(new DataSource() {
                     public String getContentType() {
-                        return "text/html";
+                        return "text/html; "+charset;
                     }
 =

                     public InputStream getInputStream() throws IOException=
 {
-                        return new ByteArrayInputStream(htmlBody.getBytes(=
"UTF-8"));
+                        //charset should be specified in jahia.props to su=
pport exotic languages
+                        return new ByteArrayInputStream(htmlBody.getBytes(=
Jahia.getSettings().getDefaultResponseBodyEncoding().toUpperCase()));
                     }
 =

                     public String getName() {

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list