[z3-checkins] r21648 - z3/CMFonFive/branch/CMFonFive-1.2

[regebro at codespeak.net]

Author: regebro
Date: Mon Jan  2 21:28:20 2006
New Revision: 21648

Modified:
   z3/CMFonFive/branch/CMFonFive-1.2/CHANGES.txt
   z3/CMFonFive/branch/CMFonFive-1.2/README.txt
   z3/CMFonFive/branch/CMFonFive-1.2/fiveactionstool.py
Log:
Minor changes  before a minor bugfix release. 


Modified: z3/CMFonFive/branch/CMFonFive-1.2/CHANGES.txt
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.2/CHANGES.txt	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.2/CHANGES.txt	Mon Jan  2 21:28:20 2006
@@ -1,5 +1,13 @@
 CMFonFive Product Changelog
 
+  CMFonFive 1.2.1 (2006/01/02)
+
+    - Menu titles was converted to strings even if they were messageIDs.
+
+    - Spelling fixes.
+
+    - metadirectives.py is not used and was removed.
+
   CMFonFive 1.2.0 (2005/07/22)
   
     - CMF 1.5.2 moves the interface bridging into CMF itself, so it it

Modified: z3/CMFonFive/branch/CMFonFive-1.2/README.txt
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.2/README.txt	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.2/README.txt	Mon Jan  2 21:28:20 2006
@@ -2,13 +2,13 @@
 =========
 
 CMFonFive is a product that provides integration between CMF and Five, 
-making it ossible to write Five products tht run on CMF.
+making it possible to write Five products that run on CMF.
 
 * http://www.zope.org/Products/CMF/
 
 * http://codespeak.net/z3/five/
 
-CMFonFive has two main parts:
+CMFonFive has three main parts:
 
 * A set of interface definitions and bridges for many parts of CMF.
   (This part has been moved to CMF itself in CMF 1.5.2).
@@ -18,6 +18,9 @@
   portal_actions tool, where the menu the item was registered for will be
   used as the action category.
 
+* A skin that bridges between the Zope 3 master template and a CMF 
+  main_template, enabling Five products to have CMF look.
+
 
 Requirements
 ------------
@@ -53,7 +56,7 @@
 
 Installation
 ------------
-The interface suppert needs no installation. If you want the menuItem 
+The interface and skin support needs no installation. If you want the menuItem 
 support, you simply create a Five Actions Tool in your CMF site, and set 
 that tool up as an action provider in the portal_actions tool.
 

Modified: z3/CMFonFive/branch/CMFonFive-1.2/fiveactionstool.py
==============================================================================
--- z3/CMFonFive/branch/CMFonFive-1.2/fiveactionstool.py	(original)
+++ z3/CMFonFive/branch/CMFonFive-1.2/fiveactionstool.py	Mon Jan  2 21:28:20 2006
@@ -68,8 +68,13 @@
                 else:
                     filter = Expression(text=str(entry['filter']))
 
+                title = entry['title']
+                # Having bits of unicode here can make rendering very confused.
+                if isinstance(title, unicode):
+                    title = str(title)
+
                 act = ActionInformation(id=act_id,
-                    title=str(entry['title']),
+                    title=title,
                     action=Expression(text='string:%s' % action),
                     condition=filter,
                     category=str(mid),