Ticket #3063: ugettext.2.diff

django/utils/translation/trans_real.py

@@ -244 +244 @@
     This function will be patched into the builtins module to provide the _
     helper function. It will use the current thread as a discriminator to find
     the translation object to use. If no current translation is activated, the
-    message will be run through the default translation object.
+    message will be run through the default translation object. Since the
+    translation objects operate in unicode, conversion from and to the default
+    encoding is done.
     """
+    from django.conf import settings
     global _default, _active
     t = _active.get(currentThread(), None)
+    umessage = message.decode(settings.DEFAULT_CHARSET)
+    # GNUTranslations.ugettext() is used instead of .gettext() since .gettext()
+    # returns either an encoded string or a unicode string depending on whether
+    # the msgid was found or not.  .ugettext() always expects a unicode msgid
+    # and returns a unicode translation.
     if t is not None:
-        return t.gettext(message)
+        return t.ugettext(umessage).encode(settings.DEFAULT_CHARSET)
     if _default is None:
         from django.conf import settings
         _default = translation(settings.LANGUAGE_CODE)
-    return _default.gettext(message)
+    return _default.ugettext(umessage).encode(settings.DEFAULT_CHARSET)
 
 def gettext_noop(message):
     """