summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-06-06 08:40:04 +0200
committerClaude Paroz <claude@2xlibre.net>2014-06-06 08:42:52 +0200
commitdaaeb8415823444a9020460cf825efc3fae866a2 (patch)
tree1bd3385165f05075ce841466e857721446fc313f
parent1fe941adb0570a58cc5d2eb372611ade8d0e8776 (diff)
Fixed #22773 -- Forced templatize() to return unicode
-rw-r--r--django/utils/translation/trans_real.py2
-rw-r--r--tests/i18n/commands/templates/empty.html0
2 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index b94c4e515d..dda2ab54c3 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -530,7 +530,7 @@ def templatize(src, origin=None):
from django.template import (Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK,
TOKEN_COMMENT, TRANSLATOR_COMMENT_MARK)
src = force_text(src, settings.FILE_CHARSET)
- out = StringIO()
+ out = StringIO('')
message_context = None
intrans = False
inplural = False
diff --git a/tests/i18n/commands/templates/empty.html b/tests/i18n/commands/templates/empty.html
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/i18n/commands/templates/empty.html