diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2013-11-22 23:47:04 -0300 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2013-11-23 11:02:30 -0300 |
| commit | 8750296918072c97a51f6809d19828ce3f1b8d40 (patch) | |
| tree | c0ea393941bf9391345df72b006d726b2ba8cb58 /docs | |
| parent | ddd3926280725fc4cedd1c511a95a57db7dde488 (diff) | |
[1.6.x] Fixed #21488 -- Multiple locales treatment in i18n commands.
Removed multiple locales separated by commas variation (that wasn't
working as documented) in favor of simply allowing use of the
``--locale``/``-l`` options more than once for ``makemessages`` and
``compilemessages``.
Thanks Romain Beylerian for the report and Claude, Simon for their help.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 7 | ||||
| -rw-r--r-- | docs/releases/1.6.1.txt | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 5dcee8fe6f..6c6ba476f6 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -131,8 +131,6 @@ Example usage:: django-admin.py compilemessages --locale=pt_BR --locale=fr django-admin.py compilemessages -l pt_BR django-admin.py compilemessages -l pt_BR -l fr - django-admin.py compilemessages --locale=pt_BR,fr - django-admin.py compilemessages -l pt_BR,fr .. versionchanged:: 1.6 @@ -523,11 +521,6 @@ Example usage:: django-admin.py makemessages -l pt_BR django-admin.py makemessages -l pt_BR -l fr -You can also use commas to separate multiple locales:: - - django-admin.py makemessages --locale=de,fr,pt_BR - django-admin.py makemessages -l de,fr,pt_BR - .. versionchanged:: 1.6 Added the ability to specify multiple locales. diff --git a/docs/releases/1.6.1.txt b/docs/releases/1.6.1.txt index db05bcdca2..683b231c77 100644 --- a/docs/releases/1.6.1.txt +++ b/docs/releases/1.6.1.txt @@ -30,3 +30,8 @@ Bug fixes key (#21472). * Fixed a regression where custom querysets for foreign keys were overwritten if ``ModelAdmin`` had ordering set (#21405). +* Removed mention of a feature in the ``--locale``/``-l`` option of + ``makemessages`` and ``compilemessages`` commands that never worked as + promised: Support of multiple locale names separated by commas. It's still + possible to specify multiplle locales in one run by suing the option + multiple times (#21488, #17181). |