diff options
| author | Claude Paroz <claude@2xlibre.net> | 2014-06-06 08:40:04 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-06-06 08:43:24 +0200 |
| commit | b236a5581898aca7bff082a6d642bf457278c658 (patch) | |
| tree | f0debd48104dbc9c7ce5253fd3c532fb9ca67058 | |
| parent | 7d388956cecf02fa84939ab913b594cd96462302 (diff) | |
[1.7.x] Fixed #22773 -- Forced templatize() to return unicode
Backport of daaeb84158 from master.
| -rw-r--r-- | django/utils/translation/trans_real.py | 2 | ||||
| -rw-r--r-- | tests/i18n/commands/templates/empty.html | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 051edb8b23..0fe5ebd7ae 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -544,7 +544,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 |