From 04ab96ec4fa7b8ce9a006cc929c152e137ac3a77 Mon Sep 17 00:00:00 2001 From: Ling-Xiao Yang Date: Fri, 7 Apr 2017 13:46:45 -0400 Subject: Fixed #28015 -- Added makemessages --add-location option. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks François Freitag for review. --- docs/ref/django-admin.txt | 14 ++++++++++++++ docs/releases/2.0.txt | 3 +++ 2 files changed, 17 insertions(+) (limited to 'docs') 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 ~~~~~~~~~~ -- cgit v1.3