optimize defaultVariables feature introduced in last release

i18next · Oct 19, 2023 · 16c8d07 · 16c8d07
1 parent 9dc5fc8
commit 16c8d07
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 13.3.1
+
+- optimize defaultVariables feature introduced in last release
+
 ### 13.3.0
 
 - Respect defaultVariables in the interpolation options [1685](https://github.com/i18next/react-i18next/issues/1685)

diff --git a/react-i18next.js b/react-i18next.js
@@ -488,22 +488,21 @@
       hashTransKey
     } = reactI18nextOptions;
     const key = i18nKey || (hashTransKey ? hashTransKey(nodeAsString || defaultValue) : nodeAsString || defaultValue);
-    let interpolationOverride = values ? tOptions.interpolation : {
+    if (i18n.options && i18n.options.interpolation && i18n.options.interpolation.defaultVariables) {
+      values = values && Object.keys(values).length > 0 ? {
+        ...values,
+        ...i18n.options.interpolation.defaultVariables
+      } : {
+        ...i18n.options.interpolation.defaultVariables
+      };
+    }
+    const interpolationOverride = values ? tOptions.interpolation : {
       interpolation: {
         ...tOptions.interpolation,
         prefix: '#$?',
         suffix: '?$#'
       }
     };
-    if (i18n.options && i18n.options.interpolation && i18n.options.interpolation.defaultVariables) {
-      if (!interpolationOverride) interpolationOverride = {};
-      interpolationOverride.interpolation = {
-        defaultVariables: {
-          ...i18n.options.interpolation.defaultVariables,
-          ...(interpolationOverride.interpolation && interpolationOverride.interpolation.defaultVariables || {})
-        }
-      };
-    }
     const combinedTOpts = {
       ...tOptions,
       count,