Commit 9c12eb55 authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.9.x] Fixed #26341 (again) -- Addressed multiple occurrences per line use case 

Backport of 4731e9d8 from master.
parent 5fc5ff48

django/core/management/commands/makemessages.py

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ class BuildFile(object): 


        return re.sub(

            r'^(#: .*)(' + re.escape(old_path) + r')',

            r'\1' + new_path,

            lambda match: match.group().replace(old_path, new_path),

            msgs,

            flags=re.MULTILINE

        )

tests/i18n/commands/templates/test.html

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ continued here.{% endcomment %} 


<!-- Source file inside a msgid, should be left as-is. -->

{% trans "#: templates/test.html.py" %}

<!-- Deliberate duplicated string. -->

{% trans "This literal should be included." %}



{% blocktrans context "Special blocktrans context #1" %}Translatable literal #8a{% endblocktrans %}

{% blocktrans count 2 context "Special blocktrans context #2" %}Translatable literal #8b-singular{% plural %}Translatable literal #8b-plural{% endblocktrans %}