Blocktrans fails in trunk if there are newlines in the text and eol is dos

[Stavros Korokithakis]

The blocktrans tag silently fails to show the translation if there are newlines in the text to be translated. Only the original text is shown.

{% blocktrans %}
A test.
{% endblocktrans %}

fails.

{% blocktrans %}A test.{% endblocktrans %}

succeeds.

[Alex Gaynor]

Please use preview.

[Ramiro Morales]

Something related to this was reported six month ago on django-users: ​http://groups.google.com/group/django-users/browse_frm/thread/c051bc5d63e14f0/9956309f9177c972?hl=en&lnk=gst#9956309f9177c972

These are my notes (from a draft of a message never sent to that thread):

I've just tested this and found Django is behaving correctly (translated content is rendered when the template is used with a proper i18n/language preference setup/translation).

Multi-line literals inside blocktrans tags are represented in the PO file as multi-line strings that end with the '\n' literal, e.g.:

msgid ""
"First line\n"
"Second line\n"
"Third line, variable content: %(line3text)s\n"
"Fourth line\n" :

it doesn't matter if the original template file containing such string has Unix or DOS line-endings (both styles were tested).

Also tested was converting the PO file to DOS line endings (starting from r8576 we are creating such files with Unix line-endings
irrespective of the platform where the makemessages command is run) before running compilemessages with similar succesful results.

Platforms where tests were performed are Linux and Windows.

Could you please attach a simple example that demonstrates this?.

[Marc Garcia]

I could get this error, but just happens when template's eol is dos. \n is correctly added to .po file, but then, it looks like when looking for the translation, string doesn't match, probably it's missing to replace dos eol by unix one.

[Marc Garcia]

Patch to show what the problem is

[Marc Garcia]

I added a patch that proof that the error is when comparing the string to translate, with the one in the catalog. They don't match, because of using different eol.

I don't think that patch is the best way to fix this error, I just added it to show what's failing.

[Marc Garcia]

(In [11429]) [soc2009/i18n] Refs #10891, fixed bug on blocktrans, that skipped translations of texts containing mac or dos end of lines.

[Jannis Leidel]

(In [11964]) Fixed #7980 - Improved i18n framework to support locale aware formatting (dates and numbers) and form processing.

Thanks to Marc Garcia for working on this during his Google Summer of Code 2009!

Additionally fixes #1061, #2203, #3940, #5526, #6449, #6231, #6693, #6783, #9366 and #10891.