Merge pull request #20766 from vivebhagat/issue-#20681

Added support for single and double quotes
abpframework · Oct 8, 2024 · 89dbcf2 · 89dbcf2
2 parents 59e9c5d + 7ddaf46
commit 89dbcf2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/npm/ng-packs/packages/core/src/lib/utils/string-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/string-utils.ts
@@ -17,8 +17,10 @@ export function createTokenParser(format: string) {
 }
 
 export function interpolate(text: string, params: string[]) {
-  return text
-    .replace(/(['"]?\{\s*(\d+)\s*\}['"]?)/g, (_, match, digit) => params[digit] ?? match)
+ return text
+    .replace(/(['"])?\{\s*(\d+)\s*\}\1/g, (_, quote, digit) => 
+      (quote ? quote : '') + (params[digit] ?? `{${digit}}`) + (quote ? quote : '')
+    )
     .replace(/\s+/g, ' ');
 }