allow defaultValue in nested translation #2174

i18next · Apr 14, 2024 · ba49a6f · ba49a6f
1 parent 677755c
commit ba49a6f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 23.11.2
+
+- allow defaultValue in nested translation [2174](https://github.com/i18next/i18next/issues/2174)
+
 ## 23.11.1
 
 - types: remove const from ParseKeys Context type parameter and disable `skipLibCheck` [2169](https://github.com/i18next/i18next/pull/2169)

diff --git a/i18next.js b/i18next.js
@@ -1421,7 +1421,7 @@
  this.logger.warn(`failed parsing options string in nesting for key ${key}`, e);
  return `${key}${sep}${optionsString}`;
  }
- delete clonedOptions.defaultValue;
+ if (clonedOptions.defaultValue && clonedOptions.defaultValue.indexOf(this.prefix) > -1) delete clonedOptions.defaultValue;
  return key;
  }
  while (match = this.nestingRegexp.exec(str)) {

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/Interpolator.js b/src/Interpolator.js
@@ -234,7 +234,8 @@ class Interpolator {
  }
 
  // assert we do not get a endless loop on interpolating defaultValue again and again
- delete clonedOptions.defaultValue;
+ if (clonedOptions.defaultValue && clonedOptions.defaultValue.indexOf(this.prefix) > -1)
+ delete clonedOptions.defaultValue;
  return key;
  }
 

diff --git a/test/runtime/translator/translator.translate.combination.test.js b/test/runtime/translator/translator.translate.combination.test.js
@@ -41,6 +41,12 @@ describe('Translator', () => {
  friend_female_zero: 'no girlfriend',
  friend_female_one: 'a girlfriend',
  friend_female_other: '{{count}} girlfriends',
+
+ message:
+ 'Something went wrong: $t(error_code.{{error_type}}, {"defaultValue": "Unknown error"})',
+ error_code: {
+ it_error: 'it went wrong',
+ },
  },
  },
  });
@@ -114,6 +120,15 @@ describe('Translator', () => {
  args: ['noKeyFoundTestingDefault_1', { defaultValue: '{{val}} bar', val: '$t(foo)' }],
  expected: 'foo bar',
  },
+
+ {
+ args: ['message', { error_type: 'it_error' }],
+ expected: 'Something went wrong: it went wrong',
+ },
+ {
+ args: ['message', { error_type: 'other_error' }],
+ expected: 'Something went wrong: Unknown error',
+ },
  ];
 
  tests.forEach((test) => {