diff options
Diffstat (limited to 'src/zope/i18n/translationdomain.py')
| -rw-r--r-- | src/zope/i18n/translationdomain.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/zope/i18n/translationdomain.py b/src/zope/i18n/translationdomain.py index 415f1ba..eb2f198 100644 --- a/src/zope/i18n/translationdomain.py +++ b/src/zope/i18n/translationdomain.py @@ -20,7 +20,7 @@ from zope.i18nmessageid import Message from zope.i18n import translate, interpolate from zope.i18n.simpletranslationdomain import SimpleTranslationDomain from zope.i18n.interfaces import ITranslationDomain, INegotiator -from ._compat import _u + # The configuration should specify a list of fallback languages for the # site. If a particular catalog for a negotiated language is not available, @@ -32,11 +32,8 @@ from ._compat import _u # message in a catalog is not translated, tough luck, you get the msgid. LANGUAGE_FALLBACKS = ['en'] -PY3 = sys.version_info[0] == 3 -if PY3: - unicode = str - -_EMPTY = _u("") +text_type = str if bytes is not str else unicode +_EMPTY = u"" class TranslationDomain(SimpleTranslationDomain): @@ -116,7 +113,7 @@ class TranslationDomain(SimpleTranslationDomain): default, context, seen) if default is None: - default = unicode(msgid) + default = text_type(msgid) # Get the translation. Use the specified fallbacks if this fails catalog_names = self._catalogs.get(target_language) |