summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authoramureki <fly.amureki@gmail.com>2016-04-03 10:02:20 +0200
committerTim Graham <timograham@gmail.com>2016-04-09 09:31:05 -0400
commitf8bbba80607435c68f34207bc1e9a133a3f9ffee (patch)
tree2407bbe9e650faafb187d4f632caa404b0adeb47 /django
parentc12a00e554c8b4b93931b520bb94a479c5ba8706 (diff)
Fixed #26403 -- Removed translated content in "Invalid block tag" message.
Diffstat (limited to 'django')
-rw-r--r--django/template/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/base.py b/django/template/base.py
index 50b55f4b69..99f30ff32d 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -564,7 +564,7 @@ class Parser(object):
"forget to register or load this tag?" % (
token.lineno,
command,
- get_text_list(["'%s'" % p for p in parse_until]),
+ get_text_list(["'%s'" % p for p in parse_until], 'or'),
),
)
raise self.error(