From 22feddf125de2d88077432dc50f6eaf87f3456e0 Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 1 Sep 2022 15:30:12 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-12612=20feat:=20FineUI=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/utils/i18n.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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] + ""); }