From d3e3703a15cd9d294406121bc43be0c75b1a4e0e Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Mon, 9 Nov 2015 15:58:24 +0200 Subject: Fixed #25720 -- Made gettext() return bytestring on Python 2 if input is bytestring. This is consistent with the behavior of Django 1.7.x and earlier. --- django/utils/translation/trans_real.py | 1 + 1 file changed, 1 insertion(+) (limited to 'django/utils') diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 918d1842ee..6c6fe6d2f2 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -103,6 +103,7 @@ class DjangoTranslation(gettext_module.GNUTranslations): def __init__(self, language): """Create a GNUTranslations() using many locale directories""" gettext_module.GNUTranslations.__init__(self) + self.set_output_charset('utf-8') # For Python 2 gettext() (#25720) self.__language = language self.__to_language = to_language(language) -- cgit v1.3