mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00
Code Issues 25 Releases Wiki Activity

Fixed #13234 -- Rejiggered the imports in the translation utils . Thanks to roklenardic and Spark23 for their reports, and to Alex for his suggestion on a potential fix.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-03-29 08:14:57 +00:00
parent aa53876610
commit 7d25682108
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/translation/__init__.py
View File

@ -1,10 +1,8 @@
"""
Internationalization support.
"""
from django.conf import settings
from django.utils.encoding import force_unicode
from django.utils.functional import lazy, curry
from django.utils.translation import trans_real, trans_null
__all__ = ['gettext', 'gettext_noop', 'gettext_lazy', 'ngettext',
@ -28,10 +26,11 @@ def delayed_loader(real_name, *args, **kwargs):
that modules can use the translation bits without actually requiring
Django's settings bits to be configured before import.
"""
from django.conf import settings
if settings.USE_I18N:
trans = trans_real
from django.utils.translation import trans_real as trans
else:
trans = trans_null
from django.utils.translation import trans_null as trans
# Make the originally requested function call on the way out the door.
return getattr(trans, real_name)(*args, **kwargs)