optimize: consistent \_zero special handling and fix dev plural rules

i18next · Jan 26, 2024 · e51e540 · e51e540
1 parent 8ac8be6
commit e51e540
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 23.7.20
+
+- optimize: consistent \_zero special handling also for defaultValue_zero [2124](https://github.com/i18next/i18next/issues/2124)
+- intl plural rule for dev is now en (consistent with v3 compatibility)
+
 ## 23.7.19
 
 - fix: consistent \_zero special handling also for defaultValue_zero [2124](https://github.com/i18next/i18next/issues/2124)

diff --git a/i18next.js b/i18next.js
@@ -610,7 +610,11 @@
           if (this.options.saveMissing) {
             if (this.options.saveMissingPlurals && needsPluralHandling) {
               lngs.forEach(language => {
-                this.pluralResolver.getSuffixes(language, options).forEach(suffix => {
+                const suffixes = this.pluralResolver.getSuffixes(language, options);
+                if (needsZeroSuffixLookup && options[`defaultValue${this.options.pluralSeparator}zero`] && suffixes.indexOf(`${this.options.pluralSeparator}zero`) < 0) {
+                  suffixes.push(`${this.options.pluralSeparator}zero`);
+                }
+                suffixes.forEach(suffix => {
                   send([language], key + suffix, options[`defaultValue${suffix}`] || defaultValue);
                 });
               });
@@ -1133,7 +1137,7 @@
       let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       if (this.shouldUseIntlApi()) {
         try {
-          return new Intl.PluralRules(getCleanedCode(code), {
+          return new Intl.PluralRules(getCleanedCode(code === 'dev' ? 'en' : code), {
             type: options.ordinal ? 'ordinal' : 'cardinal'
           });
         } catch (err) {

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/PluralResolver.js b/src/PluralResolver.js
@@ -111,7 +111,7 @@ class PluralResolver {
   getRule(code, options = {}) {
     if (this.shouldUseIntlApi()) {
       try {
-        return new Intl.PluralRules(getCleanedCode(code), { type: options.ordinal ? 'ordinal' : 'cardinal' });
+        return new Intl.PluralRules(getCleanedCode(code === 'dev' ? 'en' : code), { type: options.ordinal ? 'ordinal' : 'cardinal' });
       } catch (err) {
         return;
       }

diff --git a/src/Translator.js b/src/Translator.js
@@ -305,7 +305,15 @@ class Translator extends EventEmitter {
         if (this.options.saveMissing) {
           if (this.options.saveMissingPlurals && needsPluralHandling) {
             lngs.forEach((language) => {
-              this.pluralResolver.getSuffixes(language, options).forEach((suffix) => {
+              const suffixes = this.pluralResolver.getSuffixes(language, options);
+              if (
+                needsZeroSuffixLookup &&
+                options[`defaultValue${this.options.pluralSeparator}zero`] &&
+                suffixes.indexOf(`${this.options.pluralSeparator}zero`) < 0
+              ) {
+                suffixes.push(`${this.options.pluralSeparator}zero`);
+              }
+              suffixes.forEach((suffix) => {
                 send([language], key + suffix, options[`defaultValue${suffix}`] || defaultValue);
               });
             });

diff --git a/test/runtime/translator/translator.translate.missing.test.js b/test/runtime/translator/translator.translate.missing.test.js
@@ -128,11 +128,12 @@ describe('Translator', () => {
       });
       t.changeLanguage('ar');
 
-      t.translate('translation:test.missing', {
+      const tr = t.translate('translation:test.missing', {
         count: 0,
         defaultValue_zero: 'default0',
         defaultValue_one: 'default1',
       });
+      expect(tr).toEqual('default0');
     });
 
     it('correctly sends missing resolved value', () => {