fix delimiter problem

while1618 · Aug 29, 2024 · 953e44a · 953e44a
1 parent 8820451
commit 953e44a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/translate/translate.ts b/src/translate/translate.ts
@@ -165,8 +165,12 @@ export abstract class Translate {
   private cleanUpTranslations = (value: string): string => {
     // This is needed because of this weird bug:
     // https://github.com/while1618/i18n-auto-translation/issues/12
-    const translations = replaceAll(value, '#__ #', '#__#');
-    return replaceAll(translations, '# __#', '#__#');
+    const patterns: [string, string][] = [
+      ['#__ #', '#__#'],
+      ['# __#', '#__#'],
+      ['# __ #', '#__#'],
+    ];
+    return replaceAll(value, patterns);
   };
 
   protected abstract callTranslateAPI: (valuesForTranslation: string[]) => Promise<string>;

diff --git a/src/translate/util.ts b/src/translate/util.ts
@@ -15,5 +15,9 @@ export const addCustomCert = (certificatePath: string): https.Agent => {
 
 const escapeRegExp = (string: string): string => string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
-export const replaceAll = (str: string, find: string, replace: string): string =>
-  str.replace(new RegExp(escapeRegExp(find), 'g'), replace);
+export const replaceAll = (str: string, patterns: [string, string][]): string => {
+  return patterns.reduce(
+    (acc, [find, replace]) => acc.replace(new RegExp(escapeRegExp(find), 'g'), replace),
+    str,
+  );
+};