diff options
| author | Marti Raudsepp <marti@voicecom.ee> | 2015-11-09 15:58:24 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-11-11 08:57:46 -0500 |
| commit | 9cdfdbdd1fea70390e30d204423ab27ba788d422 (patch) | |
| tree | 84c7c46d28b300d36d1fb36047dd8277ea8c78db /django | |
| parent | 43099f543eb8cc3969c66f68579685a87bea4b37 (diff) | |
[1.8.x] 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.
Backport of d3e3703a15cd9d294406121bc43be0c75b1a4e0e from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/translation/trans_real.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index cd1ac1debe..6e7ef9b742 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -107,6 +107,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) |