i18next 22.4.8 → 22.4.10

package/dist/cjs/i18next.js

@@ -592,14 +592,24 @@ var Translator = function (_EventEmitter) {
         if (appendNamespaceToCIMode) {
           var nsSeparator = options.nsSeparator || this.options.nsSeparator;
           if (returnDetails) {
-            resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
-            return resolved;
+            return {
+              res: "".concat(namespace).concat(nsSeparator).concat(key),
+              usedKey: key,
+              exactUsedKey: key,
+              usedLng: lng,
+              usedNS: namespace
+            };
           }
           return "".concat(namespace).concat(nsSeparator).concat(key);
         }
         if (returnDetails) {
-          resolved.res = key;
-          return resolved;
+          return {
+            res: key,
+            usedKey: key,
+            exactUsedKey: key,
+            usedLng: lng,
+            usedNS: namespace
+          };
         }
         return key;
       }
@@ -1398,7 +1408,7 @@ var Interpolator = function () {
             if (typeof missingInterpolationHandler === 'function') {
               var temp = missingInterpolationHandler(str, match, options);
               value = typeof temp === 'string' ? temp : '';
-            } else if (options && options.hasOwnProperty(matchedVar)) {
+            } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
               value = '';
             } else if (skipOnVariables) {
               value = match[0];
@@ -1547,34 +1557,34 @@ var Formatter = function () {
     this.logger = baseLogger.create('formatter');
     this.options = options;
     this.formats = {
-      number: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.NumberFormat(lng, options);
+      number: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      currency: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.NumberFormat(lng, _objectSpread$2(_objectSpread$2({}, options), {}, {
+      currency: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread$2(_objectSpread$2({}, opt), {}, {
           style: 'currency'
         }));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      datetime: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2({}, options));
+      datetime: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      relativetime: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2({}, options));
+      relativetime: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
-          return formatter.format(val, options.range || 'day');
+          return formatter.format(val, opt.range || 'day');
         };
       }),
-      list: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.ListFormat(lng, _objectSpread$2({}, options));
+      list: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.ListFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
@@ -1603,8 +1613,9 @@ var Formatter = function () {
     }
   }, {
     key: "format",
-    value: function format(value, _format, lng, options) {
+    value: function format(value, _format, lng) {
       var _this = this;
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var formats = _format.split(this.formatSeparator);
       var result = formats.reduce(function (mem, f) {
         var _parseFormatStr = parseFormatStr(f),
@@ -1733,8 +1744,8 @@ var Connector = function (_EventEmitter) {
             if (!loaded[l]) loaded[l] = {};
             var loadedKeys = q.loaded[l];
             if (loadedKeys.length) {
-              loadedKeys.forEach(function (ns) {
-                if (loaded[l][ns] === undefined) loaded[l][ns] = true;
+              loadedKeys.forEach(function (n) {
+                if (loaded[l][n] === undefined) loaded[l][n] = true;
               });
             }
           });
@@ -2316,7 +2327,14 @@ var I18n = function (_EventEmitter) {
         options.ns = options.ns || fixedT.ns;
         options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
         var keySeparator = _this5.options.keySeparator || '.';
-        var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        var resultKey;
+        if (options.keyPrefix && Array.isArray(key)) {
+          resultKey = key.map(function (k) {
+            return "".concat(options.keyPrefix).concat(keySeparator).concat(k);
+          });
+        } else {
+          resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        }
         return _this5.t(resultKey, options);
       };
       if (typeof lng === 'string') {
@@ -2381,7 +2399,7 @@ var I18n = function (_EventEmitter) {
       var _this7 = this;
       var deferred = defer();
       if (!this.options.ns) {
-        callback && callback();
+        if (callback) callback();
         return Promise.resolve();
       }
       if (typeof ns === 'string') ns = [ns];

package/dist/esm/i18next.bundled.js

@@ -732,14 +732,24 @@ var Translator = function (_EventEmitter) {
         if (appendNamespaceToCIMode) {
           var nsSeparator = options.nsSeparator || this.options.nsSeparator;
           if (returnDetails) {
-            resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
-            return resolved;
+            return {
+              res: "".concat(namespace).concat(nsSeparator).concat(key),
+              usedKey: key,
+              exactUsedKey: key,
+              usedLng: lng,
+              usedNS: namespace
+            };
           }
           return "".concat(namespace).concat(nsSeparator).concat(key);
         }
         if (returnDetails) {
-          resolved.res = key;
-          return resolved;
+          return {
+            res: key,
+            usedKey: key,
+            exactUsedKey: key,
+            usedLng: lng,
+            usedNS: namespace
+          };
         }
         return key;
       }
@@ -1536,7 +1546,7 @@ var Interpolator = function () {
             if (typeof missingInterpolationHandler === 'function') {
               var temp = missingInterpolationHandler(str, match, options);
               value = typeof temp === 'string' ? temp : '';
-            } else if (options && options.hasOwnProperty(matchedVar)) {
+            } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
               value = '';
             } else if (skipOnVariables) {
               value = match[0];
@@ -1683,34 +1693,34 @@ var Formatter = function () {
     this.logger = baseLogger.create('formatter');
     this.options = options;
     this.formats = {
-      number: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.NumberFormat(lng, options);
+      number: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      currency: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.NumberFormat(lng, _objectSpread2(_objectSpread2({}, options), {}, {
+      currency: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread2(_objectSpread2({}, opt), {}, {
           style: 'currency'
         }));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      datetime: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.DateTimeFormat(lng, _objectSpread2({}, options));
+      datetime: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.DateTimeFormat(lng, _objectSpread2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      relativetime: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread2({}, options));
+      relativetime: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread2({}, opt));
         return function (val) {
-          return formatter.format(val, options.range || 'day');
+          return formatter.format(val, opt.range || 'day');
         };
       }),
-      list: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.ListFormat(lng, _objectSpread2({}, options));
+      list: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.ListFormat(lng, _objectSpread2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
@@ -1739,8 +1749,9 @@ var Formatter = function () {
     }
   }, {
     key: "format",
-    value: function format(value, _format, lng, options) {
+    value: function format(value, _format, lng) {
       var _this = this;
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var formats = _format.split(this.formatSeparator);
       var result = formats.reduce(function (mem, f) {
         var _parseFormatStr = parseFormatStr(f),
@@ -1865,8 +1876,8 @@ var Connector = function (_EventEmitter) {
             if (!loaded[l]) loaded[l] = {};
             var loadedKeys = q.loaded[l];
             if (loadedKeys.length) {
-              loadedKeys.forEach(function (ns) {
-                if (loaded[l][ns] === undefined) loaded[l][ns] = true;
+              loadedKeys.forEach(function (n) {
+                if (loaded[l][n] === undefined) loaded[l][n] = true;
               });
             }
           });
@@ -2444,7 +2455,14 @@ var I18n = function (_EventEmitter) {
         options.ns = options.ns || fixedT.ns;
         options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
         var keySeparator = _this5.options.keySeparator || '.';
-        var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        var resultKey;
+        if (options.keyPrefix && Array.isArray(key)) {
+          resultKey = key.map(function (k) {
+            return "".concat(options.keyPrefix).concat(keySeparator).concat(k);
+          });
+        } else {
+          resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        }
         return _this5.t(resultKey, options);
       };
       if (typeof lng === 'string') {
@@ -2509,7 +2527,7 @@ var I18n = function (_EventEmitter) {
       var _this7 = this;
       var deferred = defer();
       if (!this.options.ns) {
-        callback && callback();
+        if (callback) callback();
         return Promise.resolve();
       }
       if (typeof ns === 'string') ns = [ns];

package/dist/esm/i18next.js

@@ -578,14 +578,24 @@ var Translator = function (_EventEmitter) {
         if (appendNamespaceToCIMode) {
           var nsSeparator = options.nsSeparator || this.options.nsSeparator;
           if (returnDetails) {
-            resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
-            return resolved;
+            return {
+              res: "".concat(namespace).concat(nsSeparator).concat(key),
+              usedKey: key,
+              exactUsedKey: key,
+              usedLng: lng,
+              usedNS: namespace
+            };
           }
           return "".concat(namespace).concat(nsSeparator).concat(key);
         }
         if (returnDetails) {
-          resolved.res = key;
-          return resolved;
+          return {
+            res: key,
+            usedKey: key,
+            exactUsedKey: key,
+            usedLng: lng,
+            usedNS: namespace
+          };
         }
         return key;
       }
@@ -1384,7 +1394,7 @@ var Interpolator = function () {
             if (typeof missingInterpolationHandler === 'function') {
               var temp = missingInterpolationHandler(str, match, options);
               value = typeof temp === 'string' ? temp : '';
-            } else if (options && options.hasOwnProperty(matchedVar)) {
+            } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
               value = '';
             } else if (skipOnVariables) {
               value = match[0];
@@ -1533,34 +1543,34 @@ var Formatter = function () {
     this.logger = baseLogger.create('formatter');
     this.options = options;
     this.formats = {
-      number: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.NumberFormat(lng, options);
+      number: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      currency: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.NumberFormat(lng, _objectSpread$2(_objectSpread$2({}, options), {}, {
+      currency: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.NumberFormat(lng, _objectSpread$2(_objectSpread$2({}, opt), {}, {
           style: 'currency'
         }));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      datetime: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2({}, options));
+      datetime: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
       }),
-      relativetime: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2({}, options));
+      relativetime: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
-          return formatter.format(val, options.range || 'day');
+          return formatter.format(val, opt.range || 'day');
         };
       }),
-      list: createCachedFormatter(function (lng, options) {
-        var formatter = new Intl.ListFormat(lng, _objectSpread$2({}, options));
+      list: createCachedFormatter(function (lng, opt) {
+        var formatter = new Intl.ListFormat(lng, _objectSpread$2({}, opt));
         return function (val) {
           return formatter.format(val);
         };
@@ -1589,8 +1599,9 @@ var Formatter = function () {
     }
   }, {
     key: "format",
-    value: function format(value, _format, lng, options) {
+    value: function format(value, _format, lng) {
       var _this = this;
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       var formats = _format.split(this.formatSeparator);
       var result = formats.reduce(function (mem, f) {
         var _parseFormatStr = parseFormatStr(f),
@@ -1719,8 +1730,8 @@ var Connector = function (_EventEmitter) {
             if (!loaded[l]) loaded[l] = {};
             var loadedKeys = q.loaded[l];
             if (loadedKeys.length) {
-              loadedKeys.forEach(function (ns) {
-                if (loaded[l][ns] === undefined) loaded[l][ns] = true;
+              loadedKeys.forEach(function (n) {
+                if (loaded[l][n] === undefined) loaded[l][n] = true;
               });
             }
           });
@@ -2302,7 +2313,14 @@ var I18n = function (_EventEmitter) {
         options.ns = options.ns || fixedT.ns;
         options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
         var keySeparator = _this5.options.keySeparator || '.';
-        var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        var resultKey;
+        if (options.keyPrefix && Array.isArray(key)) {
+          resultKey = key.map(function (k) {
+            return "".concat(options.keyPrefix).concat(keySeparator).concat(k);
+          });
+        } else {
+          resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+        }
         return _this5.t(resultKey, options);
       };
       if (typeof lng === 'string') {
@@ -2367,7 +2385,7 @@ var I18n = function (_EventEmitter) {
       var _this7 = this;
       var deferred = defer();
       if (!this.options.ns) {
-        callback && callback();
+        if (callback) callback();
         return Promise.resolve();
       }
       if (typeof ns === 'string') ns = [ns];

package/dist/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"22.4.8"}
+{"type":"module","version":"22.4.10"}

package/dist/umd/i18next.js

@@ -687,14 +687,24 @@
           if (appendNamespaceToCIMode) {
             var nsSeparator = options.nsSeparator || this.options.nsSeparator;
             if (returnDetails) {
-              resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
-              return resolved;
+              return {
+                res: "".concat(namespace).concat(nsSeparator).concat(key),
+                usedKey: key,
+                exactUsedKey: key,
+                usedLng: lng,
+                usedNS: namespace
+              };
             }
             return "".concat(namespace).concat(nsSeparator).concat(key);
           }
           if (returnDetails) {
-            resolved.res = key;
-            return resolved;
+            return {
+              res: key,
+              usedKey: key,
+              exactUsedKey: key,
+              usedLng: lng,
+              usedNS: namespace
+            };
           }
           return key;
         }
@@ -1493,7 +1503,7 @@
               if (typeof missingInterpolationHandler === 'function') {
                 var temp = missingInterpolationHandler(str, match, options);
                 value = typeof temp === 'string' ? temp : '';
-              } else if (options && options.hasOwnProperty(matchedVar)) {
+              } else if (options && Object.prototype.hasOwnProperty.call(options, matchedVar)) {
                 value = '';
               } else if (skipOnVariables) {
                 value = match[0];
@@ -1599,9 +1609,7 @@
 
   function _arrayLikeToArray(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
-    for (var i = 0, arr2 = new Array(len); i < len; i++) {
-      arr2[i] = arr[i];
-    }
+    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
     return arr2;
   }
 
@@ -1675,34 +1683,34 @@
       this.logger = baseLogger.create('formatter');
       this.options = options;
       this.formats = {
-        number: createCachedFormatter(function (lng, options) {
-          var formatter = new Intl.NumberFormat(lng, options);
+        number: createCachedFormatter(function (lng, opt) {
+          var formatter = new Intl.NumberFormat(lng, _objectSpread$2({}, opt));
           return function (val) {
             return formatter.format(val);
           };
         }),
-        currency: createCachedFormatter(function (lng, options) {
-          var formatter = new Intl.NumberFormat(lng, _objectSpread$2(_objectSpread$2({}, options), {}, {
+        currency: createCachedFormatter(function (lng, opt) {
+          var formatter = new Intl.NumberFormat(lng, _objectSpread$2(_objectSpread$2({}, opt), {}, {
             style: 'currency'
           }));
           return function (val) {
             return formatter.format(val);
           };
         }),
-        datetime: createCachedFormatter(function (lng, options) {
-          var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2({}, options));
+        datetime: createCachedFormatter(function (lng, opt) {
+          var formatter = new Intl.DateTimeFormat(lng, _objectSpread$2({}, opt));
           return function (val) {
             return formatter.format(val);
           };
         }),
-        relativetime: createCachedFormatter(function (lng, options) {
-          var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2({}, options));
+        relativetime: createCachedFormatter(function (lng, opt) {
+          var formatter = new Intl.RelativeTimeFormat(lng, _objectSpread$2({}, opt));
           return function (val) {
-            return formatter.format(val, options.range || 'day');
+            return formatter.format(val, opt.range || 'day');
           };
         }),
-        list: createCachedFormatter(function (lng, options) {
-          var formatter = new Intl.ListFormat(lng, _objectSpread$2({}, options));
+        list: createCachedFormatter(function (lng, opt) {
+          var formatter = new Intl.ListFormat(lng, _objectSpread$2({}, opt));
           return function (val) {
             return formatter.format(val);
           };
@@ -1731,8 +1739,9 @@
       }
     }, {
       key: "format",
-      value: function format(value, _format, lng, options) {
+      value: function format(value, _format, lng) {
         var _this = this;
+        var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
         var formats = _format.split(this.formatSeparator);
         var result = formats.reduce(function (mem, f) {
           var _parseFormatStr = parseFormatStr(f),
@@ -1861,8 +1870,8 @@
               if (!loaded[l]) loaded[l] = {};
               var loadedKeys = q.loaded[l];
               if (loadedKeys.length) {
-                loadedKeys.forEach(function (ns) {
-                  if (loaded[l][ns] === undefined) loaded[l][ns] = true;
+                loadedKeys.forEach(function (n) {
+                  if (loaded[l][n] === undefined) loaded[l][n] = true;
                 });
               }
             });
@@ -2444,7 +2453,14 @@
           options.ns = options.ns || fixedT.ns;
           options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
           var keySeparator = _this5.options.keySeparator || '.';
-          var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+          var resultKey;
+          if (options.keyPrefix && Array.isArray(key)) {
+            resultKey = key.map(function (k) {
+              return "".concat(options.keyPrefix).concat(keySeparator).concat(k);
+            });
+          } else {
+            resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
+          }
           return _this5.t(resultKey, options);
         };
         if (typeof lng === 'string') {
@@ -2509,7 +2525,7 @@
         var _this7 = this;
         var deferred = defer();
         if (!this.options.ns) {
-          callback && callback();
+          if (callback) callback();
           return Promise.resolve();
         }
         if (typeof ns === 'string') ns = [ns];