fix interpolation with option skipOnVariables when there are multiple…

… placeholders #1490
i18next · Jul 16, 2020 · 7b57445 · 7b57445
1 parent 7826260
commit 7b57445
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 19.6.2
+
+- fix interpolation with option skipOnVariables when there are multiple placeholders [1490](https://github.com/i18next/i18next/issues/1490)
+
 ### 19.6.1
 
 - extend interpolation option skipOnVariables [1488](https://github.com/i18next/i18next/pull/1488)

diff --git a/i18next.js b/i18next.js
@@ -1458,6 +1458,7 @@
                 value = typeof temp === 'string' ? temp : '';
               } else if (skipOnVariables) {
                 value = match[0];
+                continue;
               } else {
                 _this.logger.warn("missed to pass in variable ".concat(match[1], " for interpolating ").concat(str));
 

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/index.d.ts b/index.d.ts
@@ -99,6 +99,12 @@ export interface InterpolationOptions {
    * @default 1000
    */
   maxReplaces?: number;
+
+  /**
+   * If true, it will skip to interpolate the variables
+   * @default false
+   */
+  skipOnVariables?: boolean;
 }
 
 export interface ReactOptions {

diff --git a/src/Interpolator.js b/src/Interpolator.js
@@ -126,6 +126,7 @@ class Interpolator {
             value = typeof temp === 'string' ? temp : '';
           } else if (skipOnVariables) {
             value = match[0];
+            continue; // this makes sure it continues to detect others
           } else {
             this.logger.warn(`missed to pass in variable ${match[1]} for interpolating ${str}`);
             value = '';

diff --git a/test/i18next.interpolation.skipOnVariables.spec.js b/test/i18next.interpolation.skipOnVariables.spec.js
@@ -14,6 +14,7 @@ describe('i18next.interpolation.nesting', () => {
           en: {
             translation: {
               key: 'value {{a}}',
+              key2: 'value {{a}} {{b}}',
               keyWithoutVar: 'value',
               nested: 'nested stuff',
               keyWithNest: '$t(nested2) value',
@@ -51,6 +52,10 @@ describe('i18next.interpolation.nesting', () => {
         args: ['key', { a: '{{nested}}' }],
         expected: 'value {{nested}}',
       },
+      {
+        args: ['key2', { a: '{{nested}}', b: 'something' }],
+        expected: 'value {{nested}} something',
+      },
     ];
 
     tests.forEach(test => {