[z3-checkins] r26677 - in z3/CMFonFive/trunk: . tests/products/CMFonFiveTest tests/products/CMFonFiveTest/tests

[regebro at codespeak.net]

Author: regebro
Date: Tue May  2 17:46:44 2006
New Revision: 26677

Modified:
   z3/CMFonFive/trunk/CHANGES.txt
   z3/CMFonFive/trunk/configure.zcml
   z3/CMFonFive/trunk/tests/products/CMFonFiveTest/configure.zcml
   z3/CMFonFive/trunk/tests/products/CMFonFiveTest/tests/test_actionstool.py
Log:
  - Got rid of some i18n warnings.
  
  - Fixed an incorrect import so it works in Zope 2.10 as well.




Modified: z3/CMFonFive/trunk/CHANGES.txt
==============================================================================
--- z3/CMFonFive/trunk/CHANGES.txt	(original)
+++ z3/CMFonFive/trunk/CHANGES.txt	Tue May  2 17:46:44 2006
@@ -1,6 +1,9 @@
 CMFonFive Product Changelog
 
   CMFonFive 1.3.3 (unreleased)
+  - Got rid of some i18n warnings.
+  
+  - Fixed an incorrect import so it works in Zope 2.10 as well.
 
   - The id of the action is now generated from the last part of the interface
     the menu item is defined for, and the last part of the action. This should

Modified: z3/CMFonFive/trunk/configure.zcml
==============================================================================
--- z3/CMFonFive/trunk/configure.zcml	(original)
+++ z3/CMFonFive/trunk/configure.zcml	Tue May  2 17:46:44 2006
@@ -1,5 +1,6 @@
 <configure
   xmlns:browser="http://namespaces.zope.org/browser"
+  i18n_domain="CMF"
   >
 
   <!-- Set up standard action categories as menus -->

Modified: z3/CMFonFive/trunk/tests/products/CMFonFiveTest/configure.zcml
==============================================================================
--- z3/CMFonFive/trunk/tests/products/CMFonFiveTest/configure.zcml	(original)
+++ z3/CMFonFive/trunk/tests/products/CMFonFiveTest/configure.zcml	Tue May  2 17:46:44 2006
@@ -1,6 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:browser="http://namespaces.zope.org/browser"
-           xmlns:five="http://namespaces.zope.org/five">
+           xmlns:five="http://namespaces.zope.org/five"
+           i18n_domain="CMF">
 
   <five:traversable class=".cmfcontent.CMFContent" />
 

Modified: z3/CMFonFive/trunk/tests/products/CMFonFiveTest/tests/test_actionstool.py
==============================================================================
--- z3/CMFonFive/trunk/tests/products/CMFonFiveTest/tests/test_actionstool.py	(original)
+++ z3/CMFonFive/trunk/tests/products/CMFonFiveTest/tests/test_actionstool.py	Tue May  2 17:46:44 2006
@@ -7,7 +7,8 @@
 from Testing import ZopeTestCase
 from Testing.ZopeTestCase.functional import Functional
 from Products.CMFCore.utils import getToolByName
-from Products.Five.traversable import newInteraction
+
+from Products.Five.security import newInteraction
 
 # we need to install test products *before* Five as Five
 # looks up zcml files in the products it can find.
@@ -31,10 +32,10 @@
         newInteraction()
         actions = tool.listActions(object=self.folder.content)
         action_names = [action.id for action in actions]
-        self.failUnless('action_content_public.html' in action_names,
+        self.failUnless('icmfcontent_public.html' in action_names,
             'Expected menu item was not found in action list')
         # But not the protected action:
-        self.failIf('action_content_protected.html' in action_names,
+        self.failIf('icmfcontent_protected.html' in action_names,
             'Protected menu item was found in action list')
         # And there should be no actions anywhere else:
         self.failUnlessEqual(list(tool.listActions(object=self.folder)), [])