Update of /cvsroot/collective/LindeMerkur/emission/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4328/emission/templates
Modified Files:
MerkurDTMLTemplate.py MerkurMultipartAlternativeTemplate.py
MerkurZPTTemplate.py
Log Message:
encoding hell and whatever more
Index: MerkurZPTTemplate.py
===================================================================
RCS file: /cvsroot/collective/LindeMerkur/emission/templates/MerkurZPTTemplate.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- MerkurZPTTemplate.py 2 Mar 2005 14:22:23 -0000 1.31
+++ MerkurZPTTemplate.py 2 Mar 2005 20:24:38 -0000 1.32
@@ -141,7 +141,7 @@
headers = self.getHeaders(userdata=userdata,
contentdata=contentdata,
**kwargs)
- headers['Content-type'] = self.getBodyContentType()
+ headers['Content-Type'] = self.getBodyContentType()
body = self.getBodyPt(userdata=userdata, contentdata=contentdata)
if seperate_headers:
return headers, body
Index: MerkurDTMLTemplate.py
===================================================================
RCS file: /cvsroot/collective/LindeMerkur/emission/templates/MerkurDTMLTemplate.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- MerkurDTMLTemplate.py 2 Mar 2005 14:22:23 -0000 1.32
+++ MerkurDTMLTemplate.py 2 Mar 2005 20:24:38 -0000 1.33
@@ -139,7 +139,7 @@
"""Returns the header/ mail-body tuple
"""
headers = self.getHeaders(userdata=userdata, contentdata=contentdata,**kwargs)
- headers['Content-type'] = self.getBodyContentType()
+ headers['Content-Type'] = self.getBodyContentType()
body=self.getBodyDTML(userdata=userdata, contentdata=contentdata)
if seperate_headers:
return headers, body
Index: MerkurMultipartAlternativeTemplate.py
===================================================================
RCS file: /cvsroot/collective/LindeMerkur/emission/templates/MerkurMultipartAlternativeTemplate.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- MerkurMultipartAlternativeTemplate.py 2 Mar 2005 14:22:23 -0000 1.35
+++ MerkurMultipartAlternativeTemplate.py 2 Mar 2005 20:24:38 -0000 1.36
@@ -122,12 +122,12 @@
for template in templates:
headers, body = template.render(userdata.copy(),contentdata.copy(),True,**kwargs)
if headers.get('Content-Type', None):
- contenttype = '%s: %s' % \
+ contenttype = '%s: %s; charset="utf-8"' % \
('Content-Type', headers['Content-Type'])
else:
contenttype = ''
print >> out, "--%s" % self.boundary
- print >> out, '%s; charset="utf-8"\n' % contenttype
+ print >> out, '%s\n' % contenttype
print >> out, body
print >> out, "--%s--" % self.boundary
|