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 16:04:58 +0100 |
| commit | 996be04c3ceb456754d9d527d4d708f30727f07e (patch) | |
| tree | 5b88460fbf2d2587e3de9452e978aaa236df5a24 /docs | |
| parent | aa0948e23801cd79798a5ceeff5ad0ecd584b982 (diff) | |
[2.2.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/topics/i18n/translation.txt | 9 |
2 files changed, 5 insertions, 9 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/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 +.. 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: |