Ticket #5056: ugettext.diff

lib/django/django/conf/__init__.py

@@ -144 +144 @@
 # django.utils.translation requires a working settings module, and loading it
 # from within this file would cause a circular import.
 def first_time_gettext(*args):
-    from django.utils.translation import gettext
-    __builtins__['_'] = gettext
-    return gettext(*args)
+    from django.utils.translation import ugettext
+    __builtins__['_'] = ugettext
+    return ugettext(*args)
 
 __builtins__['_'] = first_time_gettext

lib/django/django/utils/translation/trans_real.py

@@ -419 +419 @@
     Installs the gettext function as the default translation function under
     the name '_'.
     """
-    __builtins__['_'] = gettext
+    __builtins__['_'] = ugettext
 
 dot_re = re.compile(r'\S')
 def blankout(src, char):