Commit 1d499d50 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

[1.3.X] Fixed #15848 -- Fixed regression introduced in [15882] in makemessages... 

[1.3.X] Fixed #15848 -- Fixed regression introduced in [15882] in makemessages management command when processing multi-line comments that contain non-ASCCI characters in templates. Thanks for the report Denis Drescher.

Backport of r16038/r16039 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9b21a0c9

django/utils/translation/trans_real.py

+3 −3
Original line number Diff line number Diff line
@@ -447,16 +447,16 @@ def templatize(src, origin=None): 
    for t in Lexer(src, origin).tokenize():

        if incomment:

            if t.token_type == TOKEN_BLOCK and t.contents == 'endcomment':

                content = u''.join(comment)

                content = ''.join(comment)

                translators_comment_start = None

                for lineno, line in enumerate(content.splitlines(True)):

                    if line.lstrip().startswith(TRANSLATOR_COMMENT_MARK):

                        translators_comment_start = lineno

                for lineno, line in enumerate(content.splitlines(True)):

                    if translators_comment_start is not None and lineno >= translators_comment_start:

                        out.write(u' # %s' % line)

                        out.write(' # %s' % line)

                    else:

                        out.write(u' #\n')

                        out.write(' #\n')

                incomment = False

                comment = []

            else:

tests/regressiontests/i18n/commands/extraction.py

+4 −0
Original line number Diff line number Diff line 
# -*- encoding: utf-8 -*-

import os

import re

import shutil
@@ -63,6 +64,9 @@ class BasicExtractorTests(ExtractorTests): 
        self.assertTrue('#. Translators: One-line translator comment #4' in po_contents)

        self.assertTrue('#. Translators: Two-line translator comment #4\n#. continued here.' in po_contents)



        self.assertTrue('#. Translators: One-line translator comment #5 -- with non ASCII characters: áéíóúö' in po_contents)

        self.assertTrue('#. Translators: Two-line translator comment #5 -- with non ASCII characters: áéíóúö\n#. continued here.' in po_contents)



    def test_templatize(self):

        os.chdir(self.test_dir)

        management.call_command('makemessages', locale=LOCALE, verbosity=0)

tests/regressiontests/i18n/commands/templates/test.html

+7 −0
Original line number Diff line number Diff line
@@ -50,3 +50,10 @@ continued here. 
{% comment %}  Translators: Two-line translator comment #4

continued here.{% endcomment %}

{% trans "Translatable literal #4b" %}



{% comment %} Translators: One-line translator comment #5 -- with non ASCII characters: áéíóúö{% endcomment %}

{% trans "Translatable literal #5a" %}



{% comment %}  Translators: Two-line translator comment #5 -- with non ASCII characters: áéíóúö

continued here.{% endcomment %}

{% trans "Translatable literal #6b" %}