Allow missingInterpolationHandler to be provided as t() option

i18next · Oct 18, 2018 · 1fc55ff · 1fc55ff
1 parent 0de7e56
commit 1fc55ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/Interpolator.js b/src/Interpolator.js
@@ -55,7 +55,7 @@ class Interpolator {
     this.nestingRegexp = new RegExp(nestingRegexpStr, 'g');
   }
 
-  interpolate(str, data, lng) {
+  interpolate(str, data, lng, options) {
     let match;
     let value;
     let replaces;
@@ -76,6 +76,9 @@ class Interpolator {
 
     this.resetRegExp();
 
+    const missingInterpolationHandler = (options && options.missingInterpolationHandler) ||
+      this.options.missingInterpolationHandler;
+
     replaces = 0;
     // unescape if has unescapePrefix/Suffix
     /* eslint no-cond-assign: 0 */
@@ -94,8 +97,8 @@ class Interpolator {
     while (match = this.regexp.exec(str)) {
       value = handleFormat(match[1].trim());
       if (value === undefined) {
-        if (typeof this.options.missingInterpolationHandler === 'function') {
-          const temp = this.options.missingInterpolationHandler(str, match);
+        if (typeof missingInterpolationHandler === 'function') {
+          const temp = missingInterpolationHandler(str, match);
           value = typeof temp === 'string' ? temp : '';
         } else {
           this.logger.warn(`missed to pass in variable ${match[1]} for interpolating ${str}`);

diff --git a/src/Translator.js b/src/Translator.js
@@ -197,7 +197,7 @@ class Translator extends EventEmitter {
       // interpolate
       let data = options.replace && typeof options.replace !== 'string' ? options.replace : options;
       if (this.options.interpolation.defaultVariables) data = { ...this.options.interpolation.defaultVariables, ...data };
-      res = this.interpolator.interpolate(res, data, options.lng || this.language);
+      res = this.interpolator.interpolate(res, data, options.lng || this.language, options);
 
       // nesting
       if (options.nest !== false) res = this.interpolator.nest(res, (...args) => this.translate(...args), options);

diff --git a/test/interpolation.spec.js b/test/interpolation.spec.js
@@ -269,7 +269,7 @@ describe('Interpolator', () => {
     });
 
     tests.forEach((test) => {
-      it('correctly calls missingInterpolationHandler for ' + JSON.stringify(test.args) + ' args', () => {        
+      it('correctly calls missingInterpolationHandler for ' + JSON.stringify(test.args) + ' args', () => {
         expect(ip.interpolate.apply(ip, test.args)).to.eql(test.expected);
       });
     });
@@ -293,10 +293,16 @@ describe('Interpolator', () => {
     });
 
     tests.forEach((test) => {
-      it('correctly calls missingInterpolationHandler for ' + JSON.stringify(test.args) + ' args', () => {        
+      it('correctly calls missingInterpolationHandler for ' + JSON.stringify(test.args) + ' args', () => {
         expect(ip.interpolate.apply(ip, test.args)).to.eql(test.expected);
       });
     });
+
+    it('correctly calls handler provided via options', () => {
+      expect(ip.interpolate('{{custom}}', {}, null, {
+        missingInterpolationHandler: (str, match) => 'overridden',
+      })).to.eql('overridden');
+    });
   });
 
   describe("interpolate() - with null interpolation value - not filled by missingInterpolationHandler", () => {