Add plural support in translation skipping logic

Enhanced the translation skipping functionality to handle plural forms. Added new test cases for plural translations in 'ar' and 'fr' locales. Updated helpers and transformation logic to identify and process plural keys correctly.
i18next · Aug 15, 2024 · 2a02abc · 2a02abc
1 parent fe60f53
commit 2a02abc
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/src/helpers.js b/src/helpers.js
@@ -357,4 +357,5 @@ export {
   tsConfigLoader,
   yamlConfigLoader,
   unescape,
+  isPlural,
 }
diff --git a/src/transform.js b/src/transform.js
@@ -12,6 +12,7 @@ import {
   mergeHashes,
   transferValues,
   makeDefaultSort,
+  isPlural,
 } from './helpers.js'
 import Parser from './parser.js'
 
@@ -272,14 +273,14 @@ export default class i18nTransform extends Transform {
             if (typeof value === 'object') {
               skipIdenticalsFromCatalog(value, skipIdenticalsLocales, locale)
             } else {
-              if (shouldSkipKey(catalog, skipIdenticalsLocales, locale)) {
+              if (!isPlural(key) && shouldSkipKey(catalog, skipIdenticalsLocales, locale)) {
                 if (value === '') {
                   delete catalog[key]
                 } else if (value === key) {
                   this.warn(
                     '"' +
-                      key +
-                      '" is identical to value and you may want to remove it'
+                    key +
+                    '" is identical to value and you may want to remove it'
                   )
                 }
               }

diff --git a/test/locales/ar/test_skip_identicals.json b/test/locales/ar/test_skip_identicals.json
@@ -3,5 +3,11 @@
   "key2": {
     "key3": "ar_translation"
   },
-  "key4": "ar_translation"
+  "key4": "ar_translation",
+  "key6_few": "key6_few",
+  "key6_many": "key6_many",
+  "key6_one": "key6_one",
+  "key6_other": "key6_other",
+  "key6_two": "key6_two",
+  "key6_zero": "key6_zero"
 }
diff --git a/test/locales/en/test_skip_identicals.json b/test/locales/en/test_skip_identicals.json
@@ -3,5 +3,7 @@
   "key2": {
     "key3": "en_translation"
   },
-  "key4": "key4"
+  "key4": "key4",
+  "key6_one": "en_Key6 one",
+  "key6_other": "en_Key6 other"
 }
diff --git a/test/locales/fr/test_skip_identicals.json b/test/locales/fr/test_skip_identicals.json
@@ -2,5 +2,7 @@
   "key": "fr_translation",
   "key2": {
     "key3": "fr_translation"
-  }
+  },
+  "key6_one": "fr_Key6 one",
+  "key6_other": "fr_Key6 other"
 }
diff --git a/test/parser.test.js b/test/parser.test.js
@@ -818,7 +818,11 @@ describe('parser', () => {
             \n
             t('test_skip_identicals:key4')
             \n
-            t('test_skip_identicals:key5')`
+            t('test_skip_identicals:key5')
+            \n
+            t('test_skip_identicals:key6',{count:1})
+            \n
+            t('test_skip_identicals:key6',{count:2})`
       ),
       path: 'file.js',
     })
@@ -846,6 +850,9 @@ describe('parser', () => {
         key2: {
           key3: 'en_translation',
         },
+        key4: 'key4',
+        key6_one: "en_Key6 one",
+        key6_other: "en_Key6 other"
       })
       assert.deepEqual(arResult, {
         key: 'ar_translation',
@@ -854,12 +861,21 @@ describe('parser', () => {
         },
         key4: 'ar_translation',
         key5: '',
+        key6_few: "key6_few",
+        key6_many: "key6_many",
+        key6_one: "key6_one",
+        key6_other: "key6_other",
+        key6_two: "key6_two",
+        key6_zero: "key6_zero",
       })
       assert.deepEqual(frResult, {
         key: 'fr_translation',
         key2: {
           key3: 'fr_translation',
         },
+        key6_many: "",
+        key6_one: "fr_Key6 one",
+        key6_other: "fr_Key6 other"
       })
       done()
     })