[CMF-checkins] SVN: CMF/trunk/CMF - replaced MessageID by Message objects (the MessageID code was never released, so we need no BBB)

Yvo Schubbe y.2006_ at wcm-solutions.de
Wed Jan 18 06:05:38 EST 2006 

Log message for revision 41353:
  - replaced MessageID by Message objects (the MessageID code was never released, so we need no BBB)

Changed:
  U   CMF/trunk/CMFCalendar/setuphandlers.py
  U   CMF/trunk/CMFCalendar/skins/zpt_calendar/event_edit_form.py
  U   CMF/trunk/CMFCalendar/utils.py
  U   CMF/trunk/CMFCore/ActionInformation.py
  U   CMF/trunk/CMFCore/RegistrationTool.py
  U   CMF/trunk/CMFCore/TypesTool.py
  U   CMF/trunk/CMFCore/utils.py
  U   CMF/trunk/CMFDefault/RegistrationTool.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/document_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/file_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/full_metadata_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/image_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/link_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_paste_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/validateId.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py
  U   CMF/trunk/CMFDefault/skins/zpt_control/validateType.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py
  U   CMF/trunk/CMFDefault/skins/zpt_generic/reconfig_form.py
  U   CMF/trunk/CMFDefault/utils.py

-=-
Modified: CMF/trunk/CMFCalendar/setuphandlers.py
===================================================================
--- CMF/trunk/CMFCalendar/setuphandlers.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCalendar/setuphandlers.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -31,7 +31,7 @@
 
     # Set up a MetadataTool element policy for events
     try:
-        _ = str # MetadataTool ist not aware of MessageIDs
+        _ = str # MetadataTool ist not aware of Message objects
         mdtool.DCMI.addElementPolicy(
             element='Subject',
             content_type='Event',

Modified: CMF/trunk/CMFCalendar/skins/zpt_calendar/event_edit_form.py
===================================================================
--- CMF/trunk/CMFCalendar/skins/zpt_calendar/event_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCalendar/skins/zpt_calendar/event_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFCalendar.utils import MessageID as _
+from Products.CMFCalendar.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFCalendar/utils.py
===================================================================
--- CMF/trunk/CMFCalendar/utils.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCalendar/utils.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -16,13 +16,10 @@
 """
 
 from AccessControl import ModuleSecurityInfo
-try:
-    from zope.i18nmessageid import MessageFactory
-except ImportError: # BBB
-    from zope.i18nmessageid import MessageIDFactory as MessageFactory
+from zope.i18nmessageid import MessageFactory
 
 
 security = ModuleSecurityInfo('Products.CMFCalendar.utils')
 
-security.declarePublic('MessageID')
-MessageID = MessageFactory('cmf_calendar')
+security.declarePublic('Message')
+Message = MessageFactory('cmf_calendar')

Modified: CMF/trunk/CMFCore/ActionInformation.py
===================================================================
--- CMF/trunk/CMFCore/ActionInformation.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCore/ActionInformation.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -23,6 +23,7 @@
 from OFS.ObjectManager import IFAwareObjectManager
 from OFS.OrderedFolder import OrderedFolder
 from OFS.SimpleItem import SimpleItem
+from zope.i18nmessageid import Message
 from zope.interface import implements
 
 from Expression import Expression
@@ -35,7 +36,6 @@
 from utils import _wwwdir
 from utils import getToolByName
 from utils import SimpleItemWithProperties
-from utils import MessageFactory
 
 
 _unchanged = [] # marker
@@ -145,7 +145,7 @@
             elif id == 'i18n_domain':
                 continue
             elif self.i18n_domain and id in ('title', 'description'):
-                val = MessageFactory(self.i18n_domain)(val)
+                val = Message(val, self.i18n_domain)
             lazy_map[id] = val
 
         return (lazy_map, lazy_keys)

Modified: CMF/trunk/CMFCore/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFCore/RegistrationTool.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCore/RegistrationTool.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -35,7 +35,7 @@
 from utils import _dtmldir
 from utils import _limitGrantedRoles
 from utils import getToolByName
-from utils import MessageID as _
+from utils import Message as _
 from utils import UniqueObject
 
 

Modified: CMF/trunk/CMFCore/TypesTool.py
===================================================================
--- CMF/trunk/CMFCore/TypesTool.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCore/TypesTool.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -28,15 +28,9 @@
 from OFS.Folder import Folder
 from OFS.ObjectManager import IFAwareObjectManager
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from zope.i18nmessageid import Message
 from zope.interface import implements
-try:
-    from zope.i18nmessageid import MessageFactory
-except ImportError: # BBB
-    from zope.i18nmessageid import MessageIDFactory as MessageFactory
 
-def MessageID(val, domain): # XXX performance?
-    return MessageFactory(domain)(val)
-
 from ActionProviderBase import ActionProviderBase
 from exceptions import AccessControl_Unauthorized
 from exceptions import BadRequest
@@ -193,7 +187,7 @@
             used twice, under different names.
         """
         if self.title and self.i18n_domain:
-            return MessageID(self.title, self.i18n_domain)
+            return Message(self.title, self.i18n_domain)
         else:
             return self.title or self.getId()
 
@@ -204,7 +198,7 @@
             for display in a "constructor list").
         """
         if self.description and self.i18n_domain:
-            return MessageID(self.description, self.i18n_domain)
+            return Message(self.description, self.i18n_domain)
         else:
             return self.description
 

Modified: CMF/trunk/CMFCore/utils.py
===================================================================
--- CMF/trunk/CMFCore/utils.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFCore/utils.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -44,17 +44,13 @@
 from OFS.PropertySheets import PropertySheets
 from OFS.SimpleItem import SimpleItem
 from thread import allocate_lock
+from zope.i18nmessageid import MessageFactory
 
 from exceptions import AccessControl_Unauthorized
 from exceptions import NotFound
 from warnings import warn
 
-try:
-    from zope.i18nmessageid import MessageFactory
-except ImportError: # BBB
-    from zope.i18nmessageid import MessageIDFactory as MessageFactory
 
-
 security = ModuleSecurityInfo( 'Products.CMFCore.utils' )
 
 _dtmldir = os_path.join( package_home( globals() ), 'dtml' )
@@ -747,5 +743,5 @@
         self.__dict__.update(kw)
 
 
-security.declarePublic('MessageID')
-MessageID = MessageFactory('cmf_default')
+security.declarePublic('Message')
+Message = MessageFactory('cmf_default')

Modified: CMF/trunk/CMFDefault/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFDefault/RegistrationTool.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/RegistrationTool.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -25,7 +25,7 @@
 from Products.CMFCore.utils import getToolByName
 
 from permissions import ManagePortal
-from utils import MessageID as _
+from utils import Message as _
 
 
 class RegistrationTool(BaseTool):

Modified: CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/document_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##
 from Products.CMFDefault.exceptions import EditingConflict
 from Products.CMFDefault.exceptions import ResourceLockedError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if text_format != context.text_format or text != context.text:
     try:

Modified: CMF/trunk/CMFDefault/skins/zpt_content/document_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/document_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/document_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/file_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=file, **kw
 ##
 from Products.CMFDefault.exceptions import ResourceLockedError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 try:
     context.edit(file=file)

Modified: CMF/trunk/CMFDefault/skins/zpt_content/file_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/file_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/file_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=title, description, **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if title!=context.title or description != context.description:
     context.edit(title=title, description=description)

Modified: CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/folder_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/full_metadata_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/full_metadata_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/full_metadata_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_edit='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/image_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=file, **kw
 ##
 from Products.CMFDefault.exceptions import ResourceLockedError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 try:
     context.edit(file=file)

Modified: CMF/trunk/CMFDefault/skins/zpt_content/image_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/image_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/image_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/link_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=remote_url, **kw
 ##
 from Products.CMFDefault.exceptions import ResourceLockedError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if remote_url != context.remote_url:
     try:

Modified: CMF/trunk/CMFDefault/skins/zpt_content/link_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/link_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/link_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.exceptions import ResourceLockedError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 dtool = getToolByName(script, 'portal_discussion')
 

Modified: CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/metadata_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_edit='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=text_format, text, description='', **kw
 ##
 from Products.CMFDefault.exceptions import ResourceLockedError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if description != context.description or \
         text_format != context.text_format or text != context.text:

Modified: CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_content/newsitem_edit_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=change='', change_and_view=''
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 form = context.REQUEST.form
 if change and \

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_bottom_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=ids, **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_copy_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##title=Copy objects from a folder to the clipboard
 ##
 from Products.CMFDefault.exceptions import CopyError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 try:
     context.manage_copyObjects(ids, context.REQUEST)

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_cut_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -3,7 +3,7 @@
 ##
 from Products.CMFDefault.exceptions import CopyError
 from Products.CMFDefault.exceptions import zExceptions_Unauthorized
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 try:
     context.manage_cutObjects(ids, context.REQUEST)

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_delete_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=ids, **kw
 ##title=Delete objects from a folder
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 context.manage_delObjects( list(ids) )
 

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_down_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=ids, delta, **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_paste_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_paste_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_paste_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -3,7 +3,7 @@
 ##
 from Products.CMFDefault.exceptions import CopyError
 from Products.CMFDefault.exceptions import zExceptions_Unauthorized
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if context.cb_dataValid:
     try:

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_rename_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##title=Rename objects in a folder
 ##
 from Products.CMFDefault.exceptions import CopyError
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if not ids == new_ids:
     try:

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_top_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=ids, **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:

Modified: CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/folder_up_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=ids, delta, **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 subset_ids = [ obj.getId() for obj in context.listFolderContents() ]
 try:

Modified: CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/members_add_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -3,7 +3,7 @@
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 mtool = getToolByName(script, 'portal_membership')
 ptool = getToolByName(script, 'portal_properties')

Modified: CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/members_delete_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##title=Delete members
 ##
 from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 mtool = getToolByName(script, 'portal_membership')
 

Modified: CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/portal_config_control.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=**kw
 ##
 from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 ptool = getToolByName(script, 'portal_properties')
 

Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateId.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateId.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateId.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=id='', **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if id:
     if context.checkIdAvailable(id):

Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateItemIds.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=ids=(), **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if ids:
     return context.setStatus(True)

Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateMemberIds.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=ids=(), **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if ids:
     return context.setStatus(True)

Modified: CMF/trunk/CMFDefault/skins/zpt_control/validateType.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_control/validateType.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_control/validateType.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,6 +1,6 @@
 ##parameters=type_name='', **kw
 ##
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 if type_name:
     return context.setStatus(True)

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/breadcrumbs.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##title=Return breadcrumbs
 ##
 from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 ptool = getToolByName(script, 'portal_properties')
 utool = getToolByName(script, 'portal_url')

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/folder_contents.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -9,7 +9,7 @@
 from Products.CMFDefault.permissions import ManageProperties
 from Products.CMFDefault.permissions import ViewManagementScreens
 from Products.CMFDefault.utils import html_marshal
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 mtool = getToolByName(script, 'portal_membership')
 utool = getToolByName(script, 'portal_url')

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/folder_rename_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import html_marshal
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 utool = getToolByName(script, 'portal_url')
 portal_url = utool()

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/join_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
 mtool = getToolByName(script, 'portal_membership')

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/members_delete_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -2,7 +2,7 @@
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import html_marshal
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
 

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/members_manage_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -3,7 +3,7 @@
 from ZTUtils import Batch
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.utils import html_marshal
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
 mtool = getToolByName(script, 'portal_membership')

Modified: CMF/trunk/CMFDefault/skins/zpt_generic/reconfig_form.py
===================================================================
--- CMF/trunk/CMFDefault/skins/zpt_generic/reconfig_form.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/skins/zpt_generic/reconfig_form.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -1,7 +1,7 @@
 ##parameters=change=''
 ##
 from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.utils import MessageID as _
+from Products.CMFDefault.utils import Message as _
 
 atool = getToolByName(script, 'portal_actions')
 ptool = getToolByName(script, 'portal_properties')

Modified: CMF/trunk/CMFDefault/utils.py
===================================================================
--- CMF/trunk/CMFDefault/utils.py	2006-01-18 10:11:09 UTC (rev 41352)
+++ CMF/trunk/CMFDefault/utils.py	2006-01-18 11:05:35 UTC (rev 41353)
@@ -25,15 +25,11 @@
 from AccessControl import ModuleSecurityInfo
 from Globals import package_home
 from ZTUtils.Zope import complex_marshal
+from zope.i18nmessageid import MessageFactory
 
 from exceptions import IllegalHTML
 
-try:
-    from zope.i18nmessageid import MessageFactory
-except ImportError: # BBB
-    from zope.i18nmessageid import MessageIDFactory as MessageFactory
 
-
 security = ModuleSecurityInfo( 'Products.CMFDefault.utils' )
 
 security.declarePrivate('_dtmldir')
@@ -432,5 +428,5 @@
     else:
         return value
 
-security.declarePublic('MessageID')
-MessageID = MessageFactory('cmf_default')
+security.declarePublic('Message')
+Message = MessageFactory('cmf_default')

More information about the CMF-checkins mailing list