innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #26341 (again) -- Addressed multiple occurrences per line use case

This commit is contained in:
Claude Paroz 2016-05-01 19:21:43 +02:00
parent 4e2ee86627
commit 4731e9d82e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/management/commands/makemessages.py
View File

@ -136,7 +136,7 @@ class BuildFile(object):
return re.sub( return re.sub(
r'^(#: .*)(' + re.escape(old_path) + r')', r'^(#: .*)(' + re.escape(old_path) + r')',
r'\1' + new_path, lambda match: match.group().replace(old_path, new_path),
msgs, msgs,
flags=re.MULTILINE flags=re.MULTILINE
) )

2
tests/i18n/commands/templates/test.html
View File

@ -72,6 +72,8 @@ continued here.{% endcomment %}
<!-- Source file inside a msgid, should be left as-is. --> <!-- Source file inside a msgid, should be left as-is. -->
{% trans "#: templates/test.html.py" %} {% 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 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 %} {% blocktrans count 2 context "Special blocktrans context #2" %}Translatable literal #8b-singular{% plural %}Translatable literal #8b-plural{% endblocktrans %}