[Plone-cvs] r5934 - CMFPlone/branches/2.1

[panjunyong <svn...@pl...>]

Author: panjunyong
Date: Fri Jan 28 04:47:23 2005
New Revision: 5934

Modified:
   CMFPlone/branches/2.1/HISTORY.txt
   CMFPlone/branches/2.1/MembershipTool.py
Log:

    - Fixed wrong i18n output encoding when create member area. We must set
      correct 'content-type' header to make PTS work when call translate.
      [panjunyong]



Modified: CMFPlone/branches/2.1/HISTORY.txt
==============================================================================
--- CMFPlone/branches/2.1/HISTORY.txt	(original)
+++ CMFPlone/branches/2.1/HISTORY.txt	Fri Jan 28 04:47:23 2005
@@ -4,6 +4,10 @@
 
 Plone 2.1 - (TBA) - (Unreleased)
 
+    - Fixed wrong i18n output encoding when create member area. We must set
+      correct 'content-type' header to make PTS work when call translate.
+      [panjunyong]
+
     - Fixed PLIP16 integration to make it works with all content types, not
       limited to Plone Folder.
       [panjunyong]

Modified: CMFPlone/branches/2.1/MembershipTool.py
==============================================================================
--- CMFPlone/branches/2.1/MembershipTool.py	(original)
+++ CMFPlone/branches/2.1/MembershipTool.py	Fri Jan 28 04:47:23 2005
@@ -156,6 +156,12 @@
                     'cannot get user for member area creation'
 
         ## get some translations
+
+        # before translation we must set right encodings in header to make PTS happy
+        properties = getToolByName(self, 'portal_properties')
+        charset = properties.site_properties.getProperty('default_charset', 'utf-8')
+        self.REQUEST.RESPONSE.setHeader('Content-Type', 'text/html;charset=%s' % charset)
+
         member_folder_title = translate(
             'plone', 'title_member_folder',
             {'member': member_id}, self,