id	summary	reporter	owner	description	type	status	component	version	severity	resolution	keywords	cc	stage	has_patch	needs_docs	needs_tests	needs_better_patch	easy	ui_ux
26403	"""Invalid block tag"" message is English except for one word"	Meiyer	amureki	"The `invalid_block_tag()` function of template `Parser` makes use of the `django.utils.text.get_text_list()` function to generate the list of expected block tags. The only caveat is that `get_text_list()` takes a concatenation parameter whose default value is the **translated** string `or`, while the rest of the error message is untranslated. This results in crazy messages such as
    Invalid block tag: 'qq', expected 'xx'，'yy' 或 'zz'
(for 1.8 and earlier)
    Invalid block tag on line 234: 'qq', expected 'xx'，'yy' 或 'zz'. Did you forget to register or load this tag?
(for 1.9 and later).

Looks like the solution should be easy: pass the `'or'` concatenator to `get_text_list()` instead of relying on the default value."	Cleanup/optimization	closed	Template system	1.8	Normal	fixed			Accepted	1	0	0	0	1	1