diff --git a/src/core/utils/i18n.js b/src/core/utils/i18n.js
index 72f753015..8611ec0a9 100644
--- a/src/core/utils/i18n.js
+++ b/src/core/utils/i18n.js
@@ -22,13 +22,13 @@
             if (len > 1) {
                 if (localeText.indexOf("{R1") > -1) {
                     for (var i = 1; i < len; i++) {
-                        var reg = new RegExp(`{R${i},(.*)}`, "g");
+                        var reg = new RegExp(`{R${i},(.*?)}`, "g");
 
                         var result = reg.exec(localeText);
 
                         if (result) {
                             var formatName = result[1];
-                            localeText = BI.replaceAll(localeText, reg, i18nFormatters[formatName](arguments[i]));
+                            localeText = BI.replaceAll(localeText, reg, i18nFormatters[formatName](key, arguments[i]));
                         } else {
                             localeText = BI.replaceAll(localeText, `{R${i}}`, arguments[i] + "");
                         }