diff options
| -rw-r--r-- | django/core/management/commands/makemessages.py | 2 | ||||
| -rw-r--r-- | tests/i18n/commands/templates/test.html | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index f200a58784..0df47d306e 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -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 ) diff --git a/tests/i18n/commands/templates/test.html b/tests/i18n/commands/templates/test.html index 90970598b9..23523db7fd 100644 --- a/tests/i18n/commands/templates/test.html +++ b/tests/i18n/commands/templates/test.html @@ -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 %} |