From 5e39ada245ef9824ce73725e5d77f5941ce2920f Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Tue, 10 May 2011 18:49:04 +0000 Subject: [PATCH] Added missing callables to django.utils.translation.__all__ (`override` and `ugettext_noop`). Many thanks to Ramiro for the hint. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16211 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/translation/__init__.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index e8601efc2f..adb5566da3 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -9,13 +9,19 @@ from django.utils.functional import lazy from django.utils.importlib import import_module -__all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext', - 'ngettext_lazy', 'string_concat', 'activate', 'deactivate', - 'get_language', 'get_language_bidi', 'get_date_formats', - 'get_partial_date_formats', 'check_for_language', 'to_locale', - 'get_language_from_request', 'templatize', 'ugettext', 'ugettext_lazy', - 'ungettext', 'ungettext_lazy', 'pgettext', 'pgettext_lazy', - 'npgettext', 'npgettext_lazy', 'deactivate_all', 'get_language_info'] +__all__ = [ + 'activate', 'deactivate', 'override', 'deactivate_all', + 'get_language', 'get_language_from_request', + 'get_language_info', 'get_language_bidi', + 'check_for_language', 'to_locale', 'templatize', 'string_concat', + 'get_date_formats', 'get_partial_date_formats', + 'gettext', 'gettext_lazy', 'gettext_noop', + 'ugettext', 'ugettext_lazy', 'ugettext_noop', + 'ngettext', 'ngettext_lazy', + 'ungettext', 'ungettext_lazy', + 'pgettext', 'pgettext_lazy', + 'npgettext', 'npgettext_lazy', +] # Here be dragons, so a short explanation of the logic won't hurt: # We are trying to solve two problems: (1) access settings, in particular