[Checkins] SVN: zope.app.i18n/branches/3.4/src/zope/app/i18n/t Backport of fix committed to trunk (see rev 80860).

[Malthe Borch]

Log message for revision 80861:
  Backport of fix committed to trunk (see rev 80860).

Changed:
  U   zope.app.i18n/branches/3.4/src/zope/app/i18n/tests/test_translationdomain.py
  U   zope.app.i18n/branches/3.4/src/zope/app/i18n/translationdomain.py

-=-
Modified: zope.app.i18n/branches/3.4/src/zope/app/i18n/tests/test_translationdomain.py
===================================================================
--- zope.app.i18n/branches/3.4/src/zope/app/i18n/tests/test_translationdomain.py	2007-10-13 13:12:08 UTC (rev 80860)
+++ zope.app.i18n/branches/3.4/src/zope/app/i18n/tests/test_translationdomain.py	2007-10-13 13:15:07 UTC (rev 80861)
@@ -227,37 +227,36 @@
         self.assertEqual(domain['ca'].domain, domain.domain)
         domain.domain = 'default'
 
-
 class TestTranslationDomainInAction(unittest.TestCase):
 
     def setUp(self):
         setup.placefulSetUp()
         self.rootFolder = setup.buildSampleFolderTree()
-        sm = zapi.getGlobalSiteManager()
+        gsm = zapi.getGlobalSiteManager()
         de_catalog = MessageCatalog('de', 'default')
         de_catalog.setMessage('short_greeting', 'Hallo!', 10)
-
-        # Create global translation domain and add the catalog.
+        de_catalog.setMessage('long_greeting', 'Guten Tag!', 10)
+        
+        # register global translation domain and add the catalog.
         domain = GlobalTranslationDomain('default')
         domain.addCatalog(de_catalog)
-        sm.provideUtility(ITranslationDomain, domain, 'default')
+        gsm.registerUtility(domain, ITranslationDomain, 'default')
 
-        # Create Domain in root folder
-        mgr = setup.createSiteManager(self.rootFolder)
-        self.trans = setup.addDomain(mgr, Translation, TranslationDomain())
-
-        # Create Domain in folder1
-        mgr = setup.createSiteManager(zapi.traverse(self.rootFolder, 'folder1'))
+        # create a local site manager and add a local translation domain
         td = TranslationDomain()
         td.domain = 'default'
         de_catalog = MessageCatalog('de', 'default')
         de_catalog.setMessage('short_greeting', 'Hallo Welt!', 10)
         td['de-default-1'] = de_catalog
-        self.trans1 = setup.addDomain(mgr, Translation, ts)
 
+        mgr = setup.createSiteManager(zapi.traverse(self.rootFolder, 'folder1'))
+        setup.addUtility(mgr, 'default', ILocalTranslationDomain, td)
+
+        self.trans1 = td
+        self.trans = domain
+        
     def tearDown(self):
         setup.placefulTearDown()
-        
 
     def test_translate(self):
         self.assertEqual(
@@ -269,12 +268,16 @@
                                   target_language='de'),
             'Hallo Welt!')
 
-
+        self.assertEqual(
+            self.trans1.translate('long_greeting', 'default',
+                                  target_language='de'),
+            'Guten Tag!')
+        
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(TestTranslationDomain),
         DocTestSuite('zope.app.i18n.translationdomain'),
-        #unittest.makeSuite(TestTranslationDomainInAction),
+        unittest.makeSuite(TestTranslationDomainInAction),
         ))
 
 if __name__=='__main__':

Modified: zope.app.i18n/branches/3.4/src/zope/app/i18n/translationdomain.py
===================================================================
--- zope.app.i18n/branches/3.4/src/zope/app/i18n/translationdomain.py	2007-10-13 13:12:08 UTC (rev 80860)
+++ zope.app.i18n/branches/3.4/src/zope/app/i18n/translationdomain.py	2007-10-13 13:15:07 UTC (rev 80861)
@@ -82,7 +82,7 @@
         else:
             # If nothing found, delegate to a translation server higher up the
             # tree.
-            domain = queryNextUtility(ITranslationDomain, self.domain)
+            domain = queryNextUtility(self, ITranslationDomain, self.domain)
             if domain is not None:
                 return domain.translate(msgid, mapping, context,
                                         target_language, default=default)