[django/django] 7a7c78: Fixed #5849 -- Strip whitespace from blocktrans

[GitHub]

Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 7a7c789d5a7ce1c62e3739cb2624454189410ece
https://github.com/django/django/commit/7a7c789d5a7ce1c62e3739cb2624454189410ece
Author: Bouke Haarsma <bo...@webatoom.nl>
Date: 2013-11-07 (Thu, 07 Nov 2013)

Changed paths:
M django/templatetags/i18n.py
M django/utils/translation/__init__.py
M django/utils/translation/trans_real.py
M docs/releases/1.7.txt
M docs/topics/i18n/translation.txt
M tests/i18n/commands/templates/test.html
M tests/i18n/test_extraction.py
M tests/i18n/tests.py

Log Message:
-----------
Fixed #5849 -- Strip whitespace from blocktrans

Add the trimmed option to the blocktrans tag to trim any newlines and
whitespace from its content.

This allows the developer to indent the blocktrans tag without adding
new lines and whitespace to the msgid in the PO file.

Thanks to mpessas for the initial patch and Dmitri Fedortchenko for the
report.