[Zope3-checkins] CVS: Zope3/src/zope/app/services/translation - translationservice.py:1.13.6.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/services/translation
In directory cvs.zope.org:/tmp/cvs-serv20092/src/zope/app/services/translation

Modified Files:
      Tag: parentgeddon-branch
	translationservice.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/services/translation/translationservice.py 1.13 => 1.13.6.1 ===
--- Zope3/src/zope/app/services/translation/translationservice.py:1.13	Wed Aug 20 15:19:40 2003
+++ Zope3/src/zope/app/services/translation/translationservice.py	Mon Sep  8 14:21:50 2003
@@ -27,9 +27,10 @@
 from zope.i18n.negotiator import negotiator
 from zope.i18n.simpletranslationservice import SimpleTranslationService
 from zope.interface import implements
+from zope.app.container.contained import Contained
 
 
-class TranslationService(BTreeContainer, SimpleTranslationService):
+class TranslationService(BTreeContainer, SimpleTranslationService, Contained):
 
     implements(ILocalTranslationService, ISimpleService)
 
@@ -81,8 +82,7 @@
         catalog_names = self._catalogs.get((target_language, domain), [])
 
         for name in catalog_names:
-            catalog = zapi.ContextSuper(
-                TranslationService, self).__getitem__(name)
+            catalog = super(TranslationService, self).__getitem__(name)
             text = catalog.queryMessage(msgid)
             if text is not None:
                 break
@@ -95,7 +95,6 @@
 
         # Now we need to do the interpolation
         return self.interpolate(text, mapping)
-    translate = zapi.ContextMethod(translate)
 
     def getMessageIdsOfDomain(self, domain, filter='%'):
         'See IWriteTranslationService'