[3.1.x] Fixed #31570 -- Corrected translation loading for apps providing territorial language variants with different plural equations.

Regression in e3e48b0012.

Thanks to Shai Berger for report, reproduce and suggested fix.

Backport of dd1ca50b09 from master
This commit is contained in:
Carlton Gibson 2020-05-28 10:26:41 +02:00 committed by Mariusz Felisiak
parent 9ce281d21f
commit 98fada7244
16 changed files with 176 additions and 3 deletions

View file

@ -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`).

View file

@ -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`).