From 98fada7244f135022540ec5d2383fb0115844bb4 Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Thu, 28 May 2020 10:26:41 +0200 Subject: [3.1.x] Fixed #31570 -- Corrected translation loading for apps providing territorial language variants with different plural equations. Regression in e3e48b00127c09eafe6439d980a82fc5c591b673. Thanks to Shai Berger for report, reproduce and suggested fix. Backport of dd1ca50b096bf0351819aabc862e91a9797ddaca from master --- docs/releases/2.2.13.txt | 7 +++++-- docs/releases/3.0.7.txt | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/releases/2.2.13.txt b/docs/releases/2.2.13.txt index 450f7acdbf..cc0739e646 100644 --- a/docs/releases/2.2.13.txt +++ b/docs/releases/2.2.13.txt @@ -4,9 +4,12 @@ Django 2.2.13 release notes *Expected June 3, 2020* -Django 2.2.13 fixes two security issues and a bug in 2.2.12. +Django 2.2.13 fixes two security issues and a regression in 2.2.12. Bugfixes ======== -* ... +* Fixed a regression in Django 2.2.12 that affected translation loading for + apps providing translations for territorial language variants as well as a + generic language, where the project has different plural equations for the + language (:ticket:`31570`). diff --git a/docs/releases/3.0.7.txt b/docs/releases/3.0.7.txt index c7bc3730fd..b38a8d8059 100644 --- a/docs/releases/3.0.7.txt +++ b/docs/releases/3.0.7.txt @@ -25,3 +25,8 @@ Bugfixes * Fixed a regression in Django 3.0 where all resolved ``Subquery()`` expressions were considered equal (:ticket:`31607`). + +* Fixed a regression in Django 3.0.5 that affected translation loading for apps + providing translations for territorial language variants as well as a generic + language, where the project has different plural equations for the language + (:ticket:`31570`). -- cgit v1.3