Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #15848 -- Fixed regression introduced in [15882] in makemessage…

…s management command when processing multi-line comments that contain non-ASCCI characters in templates. Thanks for the report Denis Drescher.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16038 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0defa7dc9dc97a11baea3b91158fbc7c57e5c3a6 1 parent d3e5380
@ramiro ramiro authored
View
6 django/utils/translation/trans_real.py
@@ -435,16 +435,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:
View
7 tests/regressiontests/i18n/commands/templates/test.html
@@ -50,3 +50,10 @@
{% 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" %}

0 comments on commit 0defa7d

Please sign in to comment.
Something went wrong with that request. Please try again.