nested interpolation with data model "replace", fixes #1896

i18next · Jan 3, 2023 · 7e91be4 · 7e91be4
1 parent c3e116b
commit 7e91be4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 22.4.8
+
+- fix: nested interpolation with data model "replace"
+
 ## 22.4.7
 
 - fix: interpolation with data model "replace"

diff --git a/i18next.js b/i18next.js
@@ -832,7 +832,7 @@
             var nb = res.match(this.interpolator.nestingRegexp);
             nestBef = nb && nb.length;
           }
-          var data = options.replace && typeof options.replace !== 'string' && this.options.compatibilityAPI === 'v1' ? options.replace : options;
+          var data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
           if (this.options.interpolation.defaultVariables) data = _objectSpread$4(_objectSpread$4({}, this.options.interpolation.defaultVariables), data);
           res = this.interpolator.interpolate(res, data, options.lng || this.language, options);
           if (skipOnVariables) {
@@ -1554,6 +1554,7 @@
         while (match = this.nestingRegexp.exec(str)) {
           var formatters = [];
           clonedOptions = _objectSpread$3({}, options);
+          clonedOptions = clonedOptions.replace && typeof clonedOptions.replace !== 'string' ? clonedOptions.replace : clonedOptions;
           clonedOptions.applyPostProcessor = false;
           delete clonedOptions.defaultValue;
           var doReduce = false;

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/Interpolator.js b/src/Interpolator.js
@@ -203,6 +203,10 @@ class Interpolator {
       let formatters = [];
 
       clonedOptions = { ...options };
+      clonedOptions =
+        clonedOptions.replace && typeof clonedOptions.replace !== 'string'
+          ? clonedOptions.replace
+          : clonedOptions;
       clonedOptions.applyPostProcessor = false; // avoid post processing on nested lookup
       delete clonedOptions.defaultValue; // assert we do not get a endless loop on interpolating defaultValue again and again
 

diff --git a/src/Translator.js b/src/Translator.js
@@ -349,12 +349,7 @@ class Translator extends EventEmitter {
       }
 
       // interpolate
-      let data =
-        options.replace &&
-        typeof options.replace !== 'string' &&
-        this.options.compatibilityAPI === 'v1'
-          ? options.replace
-          : options;
+      let data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
       if (this.options.interpolation.defaultVariables)
         data = { ...this.options.interpolation.defaultVariables, ...data };
       res = this.interpolator.interpolate(res, data, options.lng || this.language, options);