Commit cc047860 authored by Julien Phalip's avatar Julien Phalip
Browse files

[1.4.x] Fixed #18881 -- Made the context option in {% trans %} and {%... 

[1.4.x] Fixed #18881 -- Made the context option in {% trans %} and {% blocktrans %} accept literals wrapped in single quotes. Thanks to lanyjie for the report.
parent 4cdc416d

django/utils/translation/trans_real.py

+2 −2
Original line number Diff line number Diff line
@@ -438,8 +438,8 @@ def blankout(src, char): 
    return dot_re.sub(char, src)



context_re = re.compile(r"""^\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?'))\s*""")

inline_re = re.compile(r"""^\s*trans\s+((?:"[^"]*?")|(?:'[^']*?'))(\s+.*context\s+(?:"[^"]*?")|(?:'[^']*?'))?\s*""")

block_re = re.compile(r"""^\s*blocktrans(\s+.*context\s+(?:"[^"]*?")|(?:'[^']*?'))?(?:\s+|$)""")

inline_re = re.compile(r"""^\s*trans\s+((?:"[^"]*?")|(?:'[^']*?'))(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?')))?\s*""")

block_re = re.compile(r"""^\s*blocktrans(\s+.*context\s+((?:"[^"]*?")|(?:'[^']*?')))?(?:\s+|$)""")

endblock_re = re.compile(r"""^\s*endblocktrans$""")

plural_re = re.compile(r"""^\s*plural$""")

constant_re = re.compile(r"""_\(((?:".*?")|(?:'.*?'))\)""")

tests/regressiontests/i18n/commands/extraction.py

+15 −0
Original line number Diff line number Diff line
@@ -149,6 +149,21 @@ class BasicExtractorTests(ExtractorTests): 
            self.assertTrue('msgctxt "Special blocktrans context #4"' in po_contents)

            self.assertTrue("Translatable literal #8d" in po_contents)



    def test_context_in_single_quotes(self):

        os.chdir(self.test_dir)

        management.call_command('makemessages', locale=LOCALE, verbosity=0)

        self.assertTrue(os.path.exists(self.PO_FILE))

        with open(self.PO_FILE, 'r') as fp:

            po_contents = fp.read()

            # {% trans %}

            self.assertTrue('msgctxt "Context wrapped in double quotes"' in po_contents)

            self.assertTrue('msgctxt "Context wrapped in single quotes"' in po_contents)



            # {% blocktrans %}

            self.assertTrue('msgctxt "Special blocktrans context wrapped in double quotes"' in po_contents)

            self.assertTrue('msgctxt "Special blocktrans context wrapped in single quotes"' in po_contents)





class JavascriptExtractorTests(ExtractorTests):



    PO_FILE='locale/%s/LC_MESSAGES/djangojs.po' % LOCALE

tests/regressiontests/i18n/commands/templates/test.html

+5 −0
Original line number Diff line number Diff line
@@ -77,3 +77,8 @@ continued here.{% endcomment %} 
{% trans "Shouldn't double escape this sequence %% either" context "ctx1" %}

{% trans "Looks like a str fmt spec %s but shouldn't be interpreted as such" %}

{% trans "Looks like a str fmt spec % o but shouldn't be interpreted as such" %}



{% trans "Translatable literal with context wrapped in single quotes" context 'Context wrapped in single quotes' as var %}

{% trans "Translatable literal with context wrapped in double quotes" context "Context wrapped in double quotes" as var %}

{% blocktrans context 'Special blocktrans context wrapped in single quotes' %}Translatable literal with context wrapped in single quotes{% endblocktrans %}

{% blocktrans context "Special blocktrans context wrapped in double quotes" %}Translatable literal with context wrapped in double quotes{% endblocktrans %}
 
 No newline at end of file