From 9cdfdbdd1fea70390e30d204423ab27ba788d422 Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Mon, 9 Nov 2015 15:58:24 +0200 Subject: [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 --- docs/releases/1.8.7.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs') diff --git a/docs/releases/1.8.7.txt b/docs/releases/1.8.7.txt index cf548ee74d..ec9f310ad9 100644 --- a/docs/releases/1.8.7.txt +++ b/docs/releases/1.8.7.txt @@ -27,3 +27,6 @@ Bugfixes * Fixed a data loss possibility with :class:`~django.db.models.Prefetch` if ``to_attr`` is set to a ``ManyToManyField`` (:ticket:`25693`). + +* Fixed a regression in 1.8 by making ``gettext()`` once again return UTF-8 + bytestrings on Python 2 if the input is a bytestring (:ticket:`25720`). -- cgit v1.3