Changeset 1140 in products

Timestamp:

Jul 23, 2009 10:36:47 AM (15 years ago)

Author:

piv

Message:

fix string encoding issues, update history file, now ready to be released as 0.2.1 version

Location:

qPloneDropDownMenu/trunk

Files:

• HISTORY.txt (modified) (1 diff)
• utils.py (modified) (3 diffs)

qPloneDropDownMenu/trunk/HISTORY.txt

@@ +1 @@
+0.2.1
+
+  * fix string encoding issues during product installation and menu regeneration
+    for details: http://talk.quintagroup.com/forums/plone-drop-down-menu/237707814
+
 0.2
 

qPloneDropDownMenu/trunk/utils.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 """ Utility functions """
 
@@ -11 +12 @@
 from config import PROPERTY_FIELD, PROPERTY_SHEET
 
+
+TAB_HTML_SNIPPET = """<li id="portaltab-%(id)s" class="plain">
+  <a href="%(url)s" accesskey="t" title="%(desc)s">%(name)s</a>
+</li>
+"""
+
+
 def addCSS(container, sheetId, title, csshovering):
     """ Add DTML Method object to portal root """
@@ -21 +29 @@
 
     # collect all portal tabs
-    context_state = getMultiAdapter((site, site.REQUEST), name=u'plone_context_state')
+    context_state = getMultiAdapter((site, site.REQUEST),
+                                    name=u'plone_context_state')
     actions = context_state.actions()
-    portal_tabs_view = getMultiAdapter((site, site.REQUEST), name='portal_tabs_view')
+    portal_tabs_view = getMultiAdapter((site, site.REQUEST),
+                                       name='portal_tabs_view')
     portal_tabs = portal_tabs_view.topLevelTabs(actions=actions)
 
     # dump to html
-    value = ''
+    value = u""
+    enc = portal_props.site_properties.getProperty('default_charset', 'utf-8')
     for tab in portal_tabs:
-        value += '<li id="portaltab-%s" class="plain">\n' % tab['id']
-        value += '  <a href="%s" accesskey="t" title="%s">%s</a>\n' % (tab['url'], tab['description'], tab['name'])
-        value += '</li>\n'
+        value += TAB_HTML_SNIPPET % {'id': toUnicode(tab['id'], enc),
+                                     'url': toUnicode(tab['url'], enc),
+                                     'desc': toUnicode(tab['description'], enc),
+                                     'name': toUnicode(tab['name'], enc)}
 
     if not hasattr(portal_props.aq_base, PROPERTY_SHEET):
-        portal_props.addPropertySheet(PROPERTY_SHEET, 'DropDown Menu Properties')
+        portal_props.addPropertySheet(PROPERTY_SHEET,
+                                      'DropDown Menu Properties')
     ap = getattr(portal_props.aq_base, PROPERTY_SHEET)
     safeEditProperty(ap, PROPERTY_FIELD, value, 'text')
+
+def toUnicode(value, enc='utf-8'):
+    if isinstance(value, str):
+        return value.decode(enc)
+    else:
+        return value