Merge pull request #27 from sidoruk-sv/fix/make-error-handling-work

Fix/make error handling work
i18next · Jun 12, 2020 · acc26e1 · acc26e1
2 parents 93d45e9 + 90ed6e6
commit acc26e1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ i18next
   // which events on resourceSource should clear the cache, can be set to false or string of events separated by " "
   bindI18nStore: '',
 
-  // Will be run when parser throws an error. Return a string to use in place of the translation.
+  // Will be run when parser throws an error. Can return any string, which can be used as a fallback, in case of broken translation.
   // If omitted, the default swallows the error and returns the unsubstituted string (res)
   parseErrorHandler: (err, key, res, options) => {}
 }

diff --git a/i18nextICU.js b/i18nextICU.js
@@ -2138,7 +2138,7 @@ var ICU = /*#__PURE__*/function () {
   }, {
     key: "addUserDefinedFormats",
     value: function addUserDefinedFormats(formats) {
-      this.formats = this.formats ? _objectSpread2({}, this.formats, {}, formats) : formats;
+      this.formats = this.formats ? _objectSpread2(_objectSpread2({}, this.formats), formats) : formats;
     }
   }, {
     key: "parse",
@@ -2151,12 +2151,12 @@ var ICU = /*#__PURE__*/function () {
         fc = getPath(this.mem, memKey);
       }
 
-      if (!fc) {
-        fc = new MessageFormat(res, lng, this.formats);
-        if (this.options.memoize && (this.options.memoizeFallback || !info || hadSuccessfulLookup)) setPath(this.mem, memKey, fc);
-      }
-
       try {
+        if (!fc) {
+          fc = new MessageFormat(res, lng, this.formats);
+          if (this.options.memoize && (this.options.memoizeFallback || !info || hadSuccessfulLookup)) setPath(this.mem, memKey, fc);
+        }
+
         return fc.format(options);
       } catch (err) {
         return this.options.parseErrorHandler(err, key, res, options);