Author: ramiro
Date: 2011-04-18 14:10:42 -0700 (Mon, 18 Apr 2011)
New Revision: 16040
Modified:
django/branches/releases/1.3.X/django/utils/translation/trans_real.py
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/extraction.py
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/templates/test.html
Log:
[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.
Modified: django/branches/releases/1.3.X/django/utils/translation/trans_real.py
===================================================================
--- django/branches/releases/1.3.X/django/utils/translation/trans_real.py
2011-04-18 21:02:57 UTC (rev 16039)
+++ django/branches/releases/1.3.X/django/utils/translation/trans_real.py
2011-04-18 21:10:42 UTC (rev 16040)
@@ -447,16 +447,16 @@
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:
Modified:
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/extraction.py
===================================================================
---
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/extraction.py
2011-04-18 21:02:57 UTC (rev 16039)
+++
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/extraction.py
2011-04-18 21:10:42 UTC (rev 16040)
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
import os
import re
import shutil
@@ -63,6 +64,9 @@
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)
Modified:
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/templates/test.html
===================================================================
---
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/templates/test.html
2011-04-18 21:02:57 UTC (rev 16039)
+++
django/branches/releases/1.3.X/tests/regressiontests/i18n/commands/templates/test.html
2011-04-18 21:10:42 UTC (rev 16040)
@@ -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" %}
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
