fix: getFixedT with keyPrefix and fallback keys usage #1604

i18next · Jan 8, 2023 · dbe9940 · dbe9940
1 parent 5bd9ac0
commit dbe9940
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 22.4.9
+
+- fix: getFixedT with keyPrefix and fallback keys usage [1604](https://github.com/i18next/i18next/issues/1604)
+
 ## 22.4.8
 
 - fix: nested interpolation with data model "replace"

diff --git a/i18next.js b/i18next.js
@@ -2444,7 +2444,14 @@
           options.ns = options.ns || fixedT.ns;
           options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
           var keySeparator = _this5.options.keySeparator || '.';
-          var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+          var resultKey;
+          if (options.keyPrefix && Array.isArray(key)) {
+            resultKey = key.map(function (k) {
+              return "".concat(options.keyPrefix).concat(keySeparator).concat(k);
+            });
+          } else {
+            resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+          }
           return _this5.t(resultKey, options);
         };
         if (typeof lng === 'string') {

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/i18next.js b/src/i18next.js
@@ -393,7 +393,12 @@ class I18n extends EventEmitter {
       options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
 
       const keySeparator = this.options.keySeparator || '.';
-      const resultKey = options.keyPrefix ? `${options.keyPrefix}${keySeparator}${key}` : key;
+      let resultKey
+      if (options.keyPrefix && Array.isArray(key)) {
+        resultKey = key.map(k => `${options.keyPrefix}${keySeparator}${k}`);
+      } else {
+        resultKey = options.keyPrefix ? `${options.keyPrefix}${keySeparator}${key}` : key;
+      }
       return this.t(resultKey, options);
     };
     if (typeof lng === 'string') {

diff --git a/test/i18next.spec.js b/test/i18next.spec.js
@@ -107,6 +107,17 @@ describe('i18next', () => {
         expect(t('nested.key', { keyPrefix: 'deeply' })).to.equal('quì!');
         expect(t.keyPrefix).to.equal('deeply.nested');
       });
+      it('should apply keyPrefix also for fallback keys', () => {
+        i18next.addResource('fr', 'translation', 'group.key1', 'Translation 1');
+        i18next.addResource('fr', 'translation', 'group.key2', 'Translation 2');
+        const t = i18next.getFixedT('fr', null, 'group');
+        expect(t('key1')).to.equal('Translation 1');
+        expect(t.keyPrefix).to.equal('group');
+        expect(t('key2')).to.equal('Translation 2');
+        expect(t.keyPrefix).to.equal('group');
+        expect(i18next.t(['group.key1', 'group.key2'], { lng: 'fr' })).to.equal('Translation 1');
+        expect(t(['key1', 'key2'])).to.equal('Translation 1');
+      });
     });
   });