i18next 21.1.0 → 21.2.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 21.2.2
+
+- log error if Intl.PluralRules API is not available
+
+## 21.2.1
+
+- do skip natural language detection, if user provided keySeparator option is passed [1670](https://github.com/i18next/i18next/issues/1670)
+
+## 21.2.0
+
+- provide bundled esm distributable [1667](https://github.com/i18next/i18next/issues/1667)
+
+## 21.1.1
+
+- optimize natural language detection [1661](https://github.com/i18next/i18next/issues/1661)
+
 ## 21.1.0
 
 - A new RTL support added for `ckb` language code

package/dist/cjs/i18next.js

@@ -303,13 +303,23 @@ function looksLikeObjectPath(key, nsSeparator, keySeparator) {
   nsSeparator = nsSeparator || '';
   keySeparator = keySeparator || '';
   var possibleChars = chars.filter(function (c) {
-    return nsSeparator.indexOf(c) < 0 || keySeparator.indexOf(c) < 0;
+    return nsSeparator.indexOf(c) < 0 && keySeparator.indexOf(c) < 0;
   });
   if (possibleChars.length === 0) return true;
   var r = new RegExp("(".concat(possibleChars.map(function (c) {
     return c === '?' ? '\\?' : c;
   }).join('|'), ")"));
-  return !r.test(key);
+  var matched = !r.test(key);
+
+  if (!matched) {
+    var ki = key.indexOf(keySeparator);
+
+    if (ki > 0 && !r.test(key.substring(0, ki))) {
+      matched = true;
+    }
+  }
+
+  return matched;
 }
 
 function deepFind(obj, path) {
@@ -598,7 +608,7 @@ var Translator = function (_EventEmitter) {
       var keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
       var namespaces = options.ns || this.options.defaultNS;
       var wouldCheckForNsInKey = nsSeparator && key.indexOf(nsSeparator) > -1;
-      var seemsNaturalLanguage = !looksLikeObjectPath(key, nsSeparator, keySeparator);
+      var seemsNaturalLanguage = !this.options.userDefinedKeySeparator && !options.keySeparator && !looksLikeObjectPath(key, nsSeparator, keySeparator);
 
       if (wouldCheckForNsInKey && !seemsNaturalLanguage) {
         var m = key.match(this.interpolator.nestingRegexp);
@@ -1268,6 +1278,11 @@ var PluralResolver = function () {
     this.languageUtils = languageUtils;
     this.options = options;
     this.logger = baseLogger.create('pluralResolver');
+
+    if ((!this.options.compatibilityJSON || this.options.compatibilityJSON === 'v4') && !Intl && !Intl.PluralRules) {
+      this.logger.error('Your environment seems not to be Inlt API compatible, use an Intl.PluralRules polyfill. Will fallback to the compatibilityJSON v3 format handling.');
+    }
+
     this.rules = createRules();
   }
 
@@ -1981,6 +1996,11 @@ var I18n = function (_EventEmitter) {
       }
 
       this.options = _objectSpread__default['default']({}, get(), this.options, transformOptions(options));
+
+      if (options.keySeparator !== undefined) {
+        this.options.userDefinedKeySeparator = options.keySeparator;
+      }
+
       this.format = this.options.interpolation.format;
       if (!callback) callback = noop;