[Zope-Checkins] SVN: Products.Five/branches/philikon-local-components/i18n.py Only use immutable i18n messages now.

[Philipp von Weitershausen]

Log message for revision 66363:
  Only use immutable i18n messages now.
  

Changed:
  U   Products.Five/branches/philikon-local-components/i18n.py

-=-
Modified: Products.Five/branches/philikon-local-components/i18n.py
===================================================================
--- Products.Five/branches/philikon-local-components/i18n.py	2006-04-04 06:33:55 UTC (rev 66362)
+++ Products.Five/branches/philikon-local-components/i18n.py	2006-04-04 06:42:48 UTC (rev 66363)
@@ -21,13 +21,8 @@
 from zope.i18n.interfaces import ITranslationDomain, IUserPreferredLanguages
 from zope.component import queryUtility
 from zope.publisher.browser import BrowserLanguages
+from zope.i18nmessageid import Message
 
-# BBB 2005/10/10 -- MessageIDs are to be removed for Zope 3.3
-import zope.deprecation
-zope.deprecation.__show__.off()
-from zope.i18nmessageid import MessageID, Message
-zope.deprecation.__show__.on()
-
 class FiveTranslationService:
     """Translation service that delegates to ``zope.i18n`` machinery.
     """
@@ -35,7 +30,7 @@
     # regarding fallback and Zope 2 compatability
     def translate(self, domain, msgid, mapping=None,
                   context=None, target_language=None, default=None):
-        if isinstance(msgid, (Message, MessageID)):
+        if isinstance(msgid, Message):
             domain = msgid.domain
             default = msgid.default
             mapping = msgid.mapping