Ticket #1076: django.i18n.3.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 names = [];
+        var str = fmt;
+        if(named) {
+                str   = fmt.replace(/%\(\w+\)s/, "%s");
+                names = fmt.match(/%\(\w+\)s/g);
+        }
+        var parts = str.split("%s");
+        if(parts.length < 2)    return fmt;
+        if(named) {
+                for(int i = 0; i < parts.length - 1; ++i) {
+                        result[result.length] = parts[i];
+                        result[result.length] = String(obj[names[i].slice(2,-2)]);
+                }
+        } else {
+                for(int i = 0; i < parts.length - 1; ++i) {
+                        result[result.length] = parts[i];
+                        result[result.length] = String(obj[i]);
+                }
+        }
+        result[result.length] = parts[names.length];
+        return result.join("");
 }
 """