From 996be04c3ceb456754d9d527d4d708f30727f07e Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 10 Mar 2020 15:56:32 +0100 Subject: [2.2.x] Fixed #30439 -- Added support for different plural forms for a language. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Michal Čihař for review. Backport of e3e48b00127c09eafe6439d980a82fc5c591b673 from master --- docs/releases/2.2.12.txt | 5 +++-- docs/topics/i18n/translation.txt | 11 +++-------- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/releases/2.2.12.txt b/docs/releases/2.2.12.txt index ca443a72ab..8585b12e7d 100644 --- a/docs/releases/2.2.12.txt +++ b/docs/releases/2.2.12.txt @@ -4,9 +4,10 @@ Django 2.2.12 release notes *Expected April 1, 2020* -Django 2.2.12 fixes several bugs in 2.2.11. +Django 2.2.12 fixes a bug in 2.2.11. Bugfixes ======== -* ... +* Added the ability to handle ``.po`` files containing different plural + equations for the same language (:ticket:`30439`). diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index b52e18e189..3aa235b202 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -279,14 +279,9 @@ In a case like this, consider something like the following:: a format specification for argument 'name', as in 'msgstr[0]', doesn't exist in 'msgid' -.. note:: Plural form and po files - - Django does not support custom plural equations in po files. As all - translation catalogs are merged, only the plural form for the main Django po - file (in ``django/conf/locale//LC_MESSAGES/django.po``) is - considered. Plural forms in all other po files are ignored. Therefore, you - should not use different plural equations in your project or application po - files. +.. versionchanged: 2.2.12 + + Added support for different plural equations in ``.po`` files. .. _contextual-markers: -- cgit v1.3