diff options
| author | Claude Paroz <claude@2xlibre.net> | 2020-03-10 15:56:32 +0100 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2020-03-10 15:57:36 +0100 |
| commit | d9f1792c7649e9f946f4a3a35a76bddf5a412b8b (patch) | |
| tree | 2798a63da1369dd8ef28b9ede4f399df3f4f0b29 /docs | |
| parent | 525274f79b183ab022675b2801cb26a9368fe1d3 (diff) | |
[3.0.x] Fixed #30439 -- Added support for different plural forms for a language.
Thanks to Michal Čihař for review.
Backport of e3e48b00127c09eafe6439d980a82fc5c591b673 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/2.2.12.txt | 5 | ||||
| -rw-r--r-- | docs/releases/3.0.5.txt | 3 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 9 |
3 files changed, 7 insertions, 10 deletions
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/releases/3.0.5.txt b/docs/releases/3.0.5.txt index e1235e060f..43b7bfe08f 100644 --- a/docs/releases/3.0.5.txt +++ b/docs/releases/3.0.5.txt @@ -9,4 +9,5 @@ Django 3.0.5 fixes several bugs in 3.0.4. 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 b02879189d..7360d73f38 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -277,14 +277,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 +.. versionchanged: 2.2.12 - 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/<lang_code>/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. + Added support for different plural equations in ``.po`` files. .. _contextual-markers: |