diff --git a/src/js/string.js b/src/js/string.js index abb46bde5cda7bb88671b391a0fcaf06936ef5f9..bdf057e10548c47b5b04ae12d851b432b7216bd9 100644 --- a/src/js/string.js +++ b/src/js/string.js @@ -20,17 +20,17 @@ var result = this; if(arguments.length > 0) { var reg; - if(arguments.length == 1 && typeof(args) == "object") { + if(arguments.length <= 2 && typeof(args) == 'object') { for(var key in args) { if(args[key] !== undefined) { - reg = new RegExp("({" + key + "})", "g"); + reg = new RegExp('(' + (arguments[1] ? arguments[1].replace('0', key) : '{' + key + '}') + ')', 'g'); result = result.replace(reg, args[key]); } } } else { for(var i = 0; i < arguments.length; i++) { if(arguments[i] !== undefined) { - reg = new RegExp("({[" + i + "]})", "g"); + reg = new RegExp('({[' + i + ']})', 'g'); result = result.replace(reg, arguments[i]); } }