fix: interpolation with data model "replace"

i18next · Jan 2, 2023 · 10153eb · 10153eb
1 parent 54e8efe
commit 10153eb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 22.4.7
+
+- fix: interpolation with data model "replace"
+
 ## 22.4.6
 
 - types: missing dir function export for typescript

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' ? options.replace : options;
+          var data = options.replace && typeof options.replace !== 'string' && this.options.compatibilityAPI === 'v1' ? 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) {

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/Translator.js b/src/Translator.js
@@ -349,7 +349,12 @@ class Translator extends EventEmitter {
       }
 
       // interpolate
-      let data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
+      let data =
+        options.replace &&
+        typeof options.replace !== 'string' &&
+        this.options.compatibilityAPI === 'v1'
+          ? 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);