Fixed #4414 -- Fixed Javascript message translation to also work when there is…

Fixed #4414 -- Fixed Javascript message translation to also work when there is more than one format marker in a string. Thanks, tobias@neuyork.de.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5849 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -257,6 +257,7 @@ answer newbie questions, and generally made Django that much better:
     thebjorn <bp@datakortet.no>
     Zach Thompson <zthompson47@gmail.com>
     tibimicu@gmax.net
+    tobias@neuyork.de
     Tom Tobin
     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
     torne-django@wolfpuppy.org.uk

django/views/i18n.py

@@ -69,9 +69,9 @@ function pluralidx(count) { return (count == 1) ? 0 : 1; }
 InterPolate = r"""
 function interpolate(fmt, obj, named) {
   if (named) {
-    return fmt.replace(/%\(\w+\)s/, function(match){return String(obj[match.slice(2,-2)])});
+    return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])});
   } else {
-    return fmt.replace(/%s/, function(match){return String(obj.shift())});
+    return fmt.replace(/%s/g, function(match){return String(obj.shift())});
   }
 }
 """