revert last optimization to address #2227

i18next · Aug 15, 2024 · 66fad4c · 66fad4c
1 parent 35d9757
commit 66fad4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 23.12.7
+
+- revert last optimization to address [2227](https://github.com/i18next/i18next/issues/2227)
+
 ## 23.12.6
 
 - remove console.log statement [2227](https://github.com/i18next/i18next/issues/2227)

diff --git a/i18next.js b/i18next.js
@@ -1459,10 +1459,8 @@
       let optForCache = options;
       if (options && options.interpolationkey && options.formatParams && options.formatParams[options.interpolationkey] && options[options.interpolationkey]) {
         optForCache = {
-          formatParams: {
-            [options.interpolationkey]: options.formatParams[options.interpolationkey]
-          },
-          interpolationKey: options.interpolationkey
+          ...optForCache,
+          [options.interpolationkey]: undefined
         };
       }
       const key = lng + JSON.stringify(optForCache);

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/Formatter.js b/src/Formatter.js
@@ -48,6 +48,7 @@ const createCachedFormatter = (fn) => {
   const cache = {};
   return (val, lng, options) => {
     let optForCache = options;
+    // this cache optimization will only work for keys having 1 interpolated value
     if (
       options &&
       options.interpolationkey &&
@@ -56,10 +57,8 @@ const createCachedFormatter = (fn) => {
       options[options.interpolationkey]
     ) {
       optForCache = {
-        formatParams: {
-          [options.interpolationkey]: options.formatParams[options.interpolationkey],
-        },
-        interpolationKey: options.interpolationkey,
+        ...optForCache,
+        [options.interpolationkey]: undefined,
       };
     }
     const key = lng + JSON.stringify(optForCache);