From 9c12eb55ceb2dff6e31399f5e258e4355e883930 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sun, 1 May 2016 19:21:43 +0200
Subject: [1.9.x] Fixed #26341 (again) -- Addressed multiple occurrences per
 line use case

Backport of 4731e9d8 from master.
---
 django/core/management/commands/makemessages.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django')

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
         )
-- 
cgit v1.3