[Checkins] SVN: zope.app.i18n/trunk/ Fix translate() when used with ZODB 4.
Marius Gedminas
cvs-admin at zope.org
Sun Dec 9 10:50:01 UTC 2012
Log message for revision 128545:
Fix translate() when used with ZODB 4.
Changed:
U zope.app.i18n/trunk/CHANGES.txt
U zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py
-=-
Modified: zope.app.i18n/trunk/CHANGES.txt
===================================================================
--- zope.app.i18n/trunk/CHANGES.txt 2012-12-09 10:32:25 UTC (rev 128544)
+++ zope.app.i18n/trunk/CHANGES.txt 2012-12-09 10:50:01 UTC (rev 128545)
@@ -5,9 +5,8 @@
3.6.4 (unreleased)
------------------
-- Nothing changed yet.
+- Fix translate() when used with ZODB 4.
-
3.6.3 (2010-09-01)
------------------
Modified: zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py 2012-12-09 10:32:25 UTC (rev 128544)
+++ zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py 2012-12-09 10:50:01 UTC (rev 128545)
@@ -23,7 +23,6 @@
import zope.component
from zope.interface import implements
from zope.i18n import interpolate
-from zope.i18n.negotiator import negotiator
from zope.i18n.interfaces import INegotiator, ITranslationDomain
from zope.i18n.simpletranslationdomain import SimpleTranslationDomain
@@ -71,7 +70,10 @@
target_language = negotiator.getLanguage(avail_langs, context)
# Get the translation. Default is the source text itself.
- catalog_names = self._catalogs.get(target_language, [])
+ if target_language is not None:
+ catalog_names = self._catalogs.get(target_language, [])
+ else:
+ catalog_names = []
for name in catalog_names:
catalog = super(TranslationDomain, self).__getitem__(name)
More information about the checkins
mailing list