diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2013-07-06 22:18:47 +0200 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2013-07-06 22:18:47 +0200 |
| commit | f4f8a4b179fdfebd032aa910bba82c5c5746d0f7 (patch) | |
| tree | c5562a6f859900c3502d70104cea288e9b41ff93 /babel/support.py | |
| parent | 0fc334840f9ed05fcc27787e0e007c26f54f6c1d (diff) | |
| download | babel-f4f8a4b179fdfebd032aa910bba82c5c5746d0f7.tar.gz | |
More gettext fixes
Diffstat (limited to 'babel/support.py')
| -rw-r--r-- | babel/support.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/babel/support.py b/babel/support.py index fb6d3ad..5c76cd6 100644 --- a/babel/support.py +++ b/babel/support.py @@ -17,7 +17,6 @@ in applications. .. note: the code in this module is not used by Babel itself """ -from datetime import date, datetime, timedelta import gettext import locale @@ -26,7 +25,7 @@ from babel.dates import format_date, format_datetime, format_time, \ format_timedelta from babel.numbers import format_number, format_decimal, format_currency, \ format_percent, format_scientific -from babel.util import UTC +from babel._compat import PY2 __all__ = ['Format', 'LazyProxy', 'NullTranslations', 'Translations'] @@ -521,6 +520,12 @@ class NullTranslations(gettext.NullTranslations, object): return self._domains.get(domain, self).lnpgettext(context, singular, plural, num) + if not PY2: + ugettext = gettext.NullTranslations.gettext + ungettext = gettext.NullTranslations.ngettext + upgettext = gettext.NullTranslations.pgettext + upnpgettext = gettext.NullTranslations.npgettext + class Translations(NullTranslations, gettext.GNUTranslations): """An extended translation catalog class.""" @@ -536,6 +541,12 @@ class Translations(NullTranslations, gettext.GNUTranslations): super(Translations, self).__init__(fp=fp) self.domain = domain or self.DEFAULT_DOMAIN + if not PY2: + ugettext = gettext.GNUTranslations.gettext + ungettext = gettext.GNUTranslations.ngettext + upgettext = gettext.GNUTranslations.pgettext + upnpgettext = gettext.GNUTranslations.npgettext + @classmethod def load(cls, dirname=None, locales=None, domain=None): """Load translations from the given directory. @@ -612,4 +623,3 @@ class Translations(NullTranslations, gettext.GNUTranslations): self.files.extend(translations.files) return self - |