Ticket #1076: django.i18n.patch

i18n.py

@@ -99 +99 @@
 
 InterPolate = r"""
 function interpolate(fmt, obj, named) {
-    if (named) {
-        return fmt.replace(/%\(\w+\)s/, function(match){return String(obj[match.slice(2,-2)])});
-    } else {
-        return fmt.replace(/%s/, function(match){return String(obj.shift())});
-    }
+        var result = [];
+        var splitter = (named ? /%\(\w+\)s/g : /%s/g);
+        var parts  = fmt.split(splitter);
+        var names  = fmt.match(splitter);
+        if(named) {
+                for(int i = 0; i < parts.length; ++i) {
+                        result[result.length] = parts[i];
+                        result[result.length] = String(obj[names[i].slice(2,-2)]);
+                }
+        } else {
+                for(int i = 0; i < parts.length; ++i) {
+                        result[result.length] = parts[i];
+                        result[result.length] = String(obj[i]);
+                }
+        }
+        //if(parts.length > names.length) { // you may not need it
+        result[result.length] = parts[names.length];
+        //}
+        return result.join("");
 }
 """