fix: consistent _zero special handling also for defaultValue_zero #2124

i18next · Jan 24, 2024 · c55917e · c55917e
1 parent ffd59fd
commit c55917e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 23.7.19
+
+- fix: consistent \_zero special handling also for defaultValue_zero [2124](https://github.com/i18next/i18next/issues/2124)
+
 ## 23.7.18
 
 - types: support readonly defaultNS [2123](https://github.com/i18next/i18next/pull/2123)

diff --git a/i18next.js b/i18next.js
@@ -565,7 +565,8 @@
         const defaultValueSuffixOrdinalFallback = options.ordinal && needsPluralHandling ? this.pluralResolver.getSuffix(lng, options.count, {
           ordinal: false
         }) : '';
-        const defaultValue = options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
+        const needsZeroSuffixLookup = needsPluralHandling && !options.ordinal && options.count === 0 && this.pluralResolver.shouldUseIntlApi();
+        const defaultValue = needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] || options[`defaultValue${defaultValueSuffix}`] || options[`defaultValue${defaultValueSuffixOrdinalFallback}`] || options.defaultValue;
         if (!this.isValidLookup(res) && hasDefaultValue) {
           usedDefault = true;
           res = defaultValue;

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/Translator.js b/src/Translator.js
@@ -219,7 +219,13 @@ class Translator extends EventEmitter {
         options.ordinal && needsPluralHandling
           ? this.pluralResolver.getSuffix(lng, options.count, { ordinal: false })
           : '';
+      const needsZeroSuffixLookup =
+        needsPluralHandling &&
+        !options.ordinal &&
+        options.count === 0 &&
+        this.pluralResolver.shouldUseIntlApi();
       const defaultValue =
+        (needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`]) ||
         options[`defaultValue${defaultValueSuffix}`] ||
         options[`defaultValue${defaultValueSuffixOrdinalFallback}`] ||
         options.defaultValue;

diff --git a/test/runtime/translator/translator.translate.defaultValue.test.js b/test/runtime/translator/translator.translate.defaultValue.test.js
@@ -32,6 +32,7 @@ describe('Translator', () => {
             interpolateDefaultValue: true,
             interpolateKey: true,
           },
+          pluralSeparator: '_',
         },
       );
       t.changeLanguage('en');
@@ -47,6 +48,18 @@ describe('Translator', () => {
         ],
         expected: 'test_en_plural',
       },
+      {
+        args: [
+          'translation:testMe',
+          {
+            defaultValue_other: 'test_en_plural',
+            defaultValue_one: 'test_en',
+            defaultValue_zero: 'test_en_zero',
+            count: 0,
+          },
+        ],
+        expected: 'test_en_zero',
+      },
     ];
 
     tests.forEach((test) => {