summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLing-Xiao Yang <ling-xiao.yang@savoirfairelinux.com>2017-04-07 13:46:45 -0400
committerTim Graham <timograham@gmail.com>2017-05-22 09:03:53 -0400
commit04ab96ec4fa7b8ce9a006cc929c152e137ac3a77 (patch)
tree49c7d25313f2e195d534213e178726de2b2df212 /docs
parent3e9aa298719f19d5f09dbe0df29b6bb8d2136229 (diff)
Fixed #28015 -- Added makemessages --add-location option.
Thanks François Freitag for review.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt14
-rw-r--r--docs/releases/2.0.txt3
2 files changed, 17 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 45fd50b587..9ffb624879 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -647,6 +647,20 @@ Suppresses writing '``#: filename:line``’ comment lines in language files.
Using this option makes it harder for technically skilled translators to
understand each message's context.
+.. django-admin-option:: --add-location [{full,file,never}]
+
+.. versionadded:: 2.0
+
+Controls ``#: filename:line`` comment lines in language files. If the option
+is:
+
+* ``full`` (the default if not given): the lines include both file name and
+ line number.
+* ``file``: the line number is omitted.
+* ``never``: the lines are suppressed (same as :option:`--no-location`).
+
+Requires ``gettext`` 0.19 or newer.
+
.. django-admin-option:: --keep-pot
Prevents deleting the temporary ``.pot`` files generated before creating the
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index e891cb4614..0411e8fb2d 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -182,6 +182,9 @@ Management Commands
* :djadmin:`inspectdb` now translates MySQL's unsigned integer columns to
``PositiveIntegerField`` or ``PositiveSmallIntegerField``.
+* The new :option:`makemessages --add-location` option controls the comment
+ format in PO files.
+
Migrations
~~~~~~~~~~