[Checkins] SVN: zope.app.i18n/trunk/src/zope/app/i18n/t Merge r77595:77596 from 3.3 branch

[Daniel Nouri]

Log message for revision 77597:
  Merge r77595:77596 from 3.3 branch
  

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

-=-
Modified: zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py	2007-07-07 23:06:09 UTC (rev 77596)
+++ zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py	2007-07-07 23:08:39 UTC (rev 77597)
@@ -220,7 +220,14 @@
             self._domain.translate('short_greeting', target_language='en'),
             'Hello!')
 
+    def testCatalogDomain(self):
+        domain = self._domain
+        domain.domain = 'myfault'
+        domain.addMessage('greeting2', 'Hola!', 'ca')
+        self.assertEqual(domain['ca'].domain, domain.domain)
+        domain.domain = 'default'
 
+
 class TestTranslationDomainInAction(unittest.TestCase):
 
     def setUp(self):

Modified: zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py	2007-07-07 23:06:09 UTC (rev 77596)
+++ zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py	2007-07-07 23:08:39 UTC (rev 77597)
@@ -168,6 +168,7 @@
         'See `IWriteTranslationDomain`'
         catalog = zope.component.createObject(u'zope.app.MessageCatalog',
                                               language)
+        catalog.domain = self.domain
         self[language] = catalog