[Plone-cvs] r10340 - in CMFPlone/branches/2.5: . browser

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

Author: hannosch
Date: Tue Aug  1 18:22:43 2006
New Revision: 10340

Modified:
   CMFPlone/branches/2.5/HISTORY.txt
   CMFPlone/branches/2.5/browser/plone.py
Log:
Fixed language setting in the html page header. This closes #5444.

Modified: CMFPlone/branches/2.5/HISTORY.txt
==============================================================================
--- CMFPlone/branches/2.5/HISTORY.txt	(original)
+++ CMFPlone/branches/2.5/HISTORY.txt	Tue Aug  1 18:22:43 2006
@@ -2,6 +2,10 @@
 
    (name of developer listed in brackets)
 
+    - Fixed language setting in the html page header. This closes
+      http://dev.plone.org/plone/ticket/5444.
+      [hannosch]
+
     - Added a few tests for the calendar view.
       [hannosch]
 

Modified: CMFPlone/branches/2.5/browser/plone.py
==============================================================================
--- CMFPlone/branches/2.5/browser/plone.py	(original)
+++ CMFPlone/branches/2.5/browser/plone.py	Tue Aug  1 18:22:43 2006
@@ -143,8 +143,8 @@
         self._data['default_language'] = default_language = \
                               site_props.getProperty('default_language', None)
         self._data['language'] =  self.request.get('language', None) or \
-                                  context.Language or default_language
-        self._data['is_editable'] =  checkPermission('Modify portal content',
+                                  context.Language() or default_language
+        self._data['is_editable'] = checkPermission('Modify portal content',
                                                      context)
         # BBB: isEditable is deprecated use is_editable instead
         self._data['isEditable'] =  self._data['is_editable']