[Zope3-checkins] SVN: Zope3/trunk/src/zope/i18n/ Added logic to use fallback domains when a message id lacks a domain

[Jim Fulton]

Log message for revision 39993:
  Added logic to use fallback domains when a message id lacks a domain
  or when a domain can't be found.
  

Changed:
  U   Zope3/trunk/src/zope/i18n/__init__.py
  A   Zope3/trunk/src/zope/i18n/tests/test.py

-=-
Modified: Zope3/trunk/src/zope/i18n/__init__.py
===================================================================
--- Zope3/trunk/src/zope/i18n/__init__.py	2005-11-08 22:57:47 UTC (rev 39992)
+++ Zope3/trunk/src/zope/i18n/__init__.py	2005-11-08 22:57:49 UTC (rev 39993)
@@ -47,7 +47,12 @@
     if default is None:
         default = msgid
 
-    util = queryUtility(ITranslationDomain, domain)
+    if domain:
+        util = queryUtility(ITranslationDomain, domain)
+        if util is None:
+            util = queryUtility(ITranslationDomain)
+    else:
+        util = queryUtility(ITranslationDomain)
 
     if util is None:
         return interpolate(default, mapping)

Added: Zope3/trunk/src/zope/i18n/tests/test.py
===================================================================
--- Zope3/trunk/src/zope/i18n/tests/test.py	2005-11-08 22:57:47 UTC (rev 39992)
+++ Zope3/trunk/src/zope/i18n/tests/test.py	2005-11-08 22:57:49 UTC (rev 39993)
@@ -0,0 +1,72 @@
+##############################################################################
+#
+# Copyright (c) 2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Misc tests
+
+$Id$
+"""
+import unittest
+
+from zope import component, interface
+from zope.component.testing import setUp, tearDown
+import zope.i18n.interfaces
+from zope.i18n import _translate
+
+class TestDomain:
+    interface.implements(zope.i18n.interfaces.ITranslationDomain)
+
+    def __init__(self, **catalog):
+        self.catalog = catalog
+
+    def translate(self, text, *_, **__):
+        return self.catalog[text]
+        
+
+def test_fallback_domain():
+    """\
+Normally, the translation system will use a domain utility:
+
+    >>> component.provideUtility(TestDomain(eek=u'ook'), name='my.domain')
+    >>> _translate(u'eek', 'my.domain')
+    u'ook'
+
+Normally, if no domain is given, or if there is no domain utility
+for the given domain, then the text isn't translated:
+
+    >>> _translate(u'eek')
+    u'eek'
+
+    >>> _translate(u'eek', 'your.domain')
+    u'eek'
+
+A fallback domain can be provided. This is normally used for testing:
+
+    >>> component.provideUtility(TestDomain(eek=u'test'))
+
+    >>> _translate(u'eek')
+    u'test'
+
+    >>> _translate(u'eek', 'your.domain')
+    u'test'
+    
+    """
+
+def test_suite():
+    from zope.testing import doctest
+    return unittest.TestSuite((
+        doctest.DocTestSuite(setUp=setUp, tearDown=tearDown),
+        ))
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
+


Property changes on: Zope3/trunk/src/zope/i18n/tests/test.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native