"Invalid block tag" message is English except for one word

[Meiyer]

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.

[Susan Tan]

What is the github pull request link?

[amureki]

Replying to susan:

What is the github pull request link?

It is displayed in top menu on "Pull requests" part.

Here is fast link: ​https://github.com/django/django/pull/6386

P.S. I'll update it with tests as needed.

[amureki]

Updated PR (​https://github.com/django/django/pull/6386) with test.

[Claude Paroz]

The Ready for checkin flag is not supposed to be set by the patch author, but by a reviewer.

[Tim Graham <timograham@…>]

In f8bbba80:

Fixed #26403 -- Removed translated content in "Invalid block tag" message.