locizify 5.1.0 → 5.2.2

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+### v5.2.2
+
+- update i18next dependencies
+
+### v5.2.1
+
+- update i18next dependencies
+
+### v5.2.0
+
+- update i18next dependencies
+
 ### v5.1.0
 
 - update locize dependecy and expose editor functions turnOn/Off

package/dist/commonjs/index.js

@@ -17,9 +17,9 @@ var _i18nextLocizeBackend = _interopRequireDefault(require("i18next-locize-backe
 
 var _locize = require("locize");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 var i18next = _i18nextify["default"].i18next;
 var enforce = {

package/dist/es/index.js

@@ -1,9 +1,9 @@
 import _typeof from "@babel/runtime/helpers/typeof";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 import i18nextify from 'i18nextify';
 import LocizeBackend from 'i18next-locize-backend';

package/dist/umd/locizify.js

@@ -4,14 +4,30 @@
   (global = global || self, global.locizify = factory());
 }(this, (function () { 'use strict';
 
+  function _defineProperty(obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+
+    return obj;
+  }
+
   function ownKeys(object, enumerableOnly) {
     var keys = Object.keys(object);
 
     if (Object.getOwnPropertySymbols) {
       var symbols = Object.getOwnPropertySymbols(object);
-      enumerableOnly && (symbols = symbols.filter(function (sym) {
+      if (enumerableOnly) symbols = symbols.filter(function (sym) {
         return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      })), keys.push.apply(keys, symbols);
+      });
+      keys.push.apply(keys, symbols);
     }
 
     return keys;
@@ -19,30 +35,22 @@
 
   function _objectSpread2(target) {
     for (var i = 1; i < arguments.length; i++) {
-      var source = null != arguments[i] ? arguments[i] : {};
-      i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-
-    return target;
-  }
+      var source = arguments[i] != null ? arguments[i] : {};
 
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
+      if (i % 2) {
+        ownKeys(Object(source), true).forEach(function (key) {
+          _defineProperty(target, key, source[key]);
+        });
+      } else if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+      } else {
+        ownKeys(Object(source)).forEach(function (key) {
+          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+      }
     }
 
-    return obj;
+    return target;
   }
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -538,7 +546,7 @@
     return data;
   }
 
-  var isIE10 = typeof window !== 'undefined' && window.navigator && window.navigator.userAgent && window.navigator.userAgent.indexOf('MSIE') > -1;
+  var isIE10 = typeof window !== 'undefined' && window.navigator && typeof window.navigator.userAgentData === 'undefined' && window.navigator.userAgent && window.navigator.userAgent.indexOf('MSIE') > -1;
   var chars = [' ', ',', '?', '!', ';'];
 
   function looksLikeObjectPath(key, nsSeparator, keySeparator) {
@@ -1033,6 +1041,7 @@
         if (!options) options = {};
         if (keys === undefined || keys === null) return '';
         if (!Array.isArray(keys)) keys = [String(keys)];
+        var returnDetails = options.returnDetails !== undefined ? options.returnDetails : this.options.returnDetails;
         var keySeparator = options.keySeparator !== undefined ? options.keySeparator : this.options.keySeparator;
 
         var _this$extractFromKey = this.extractFromKey(keys[keys.length - 1], options),
@@ -1046,7 +1055,18 @@
         if (lng && lng.toLowerCase() === 'cimode') {
           if (appendNamespaceToCIMode) {
             var nsSeparator = options.nsSeparator || this.options.nsSeparator;
-            return namespace + nsSeparator + key;
+
+            if (returnDetails) {
+              resolved.res = "".concat(namespace).concat(nsSeparator).concat(key);
+              return resolved;
+            }
+
+            return "".concat(namespace).concat(nsSeparator).concat(key);
+          }
+
+          if (returnDetails) {
+            resolved.res = key;
+            return resolved;
           }
 
           return key;
@@ -1068,9 +1088,16 @@
               this.logger.warn('accessing an object - but returnObjects options is not enabled!');
             }
 
-            return this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, res, _objectSpread$2(_objectSpread$2({}, options), {}, {
+            var r = this.options.returnedObjectHandler ? this.options.returnedObjectHandler(resUsedKey, res, _objectSpread$2(_objectSpread$2({}, options), {}, {
               ns: namespaces
             })) : "key '".concat(key, " (").concat(this.language, ")' returned an object instead of string.");
+
+            if (returnDetails) {
+              resolved.res = r;
+              return resolved;
+            }
+
+            return r;
           }
 
           if (keySeparator) {
@@ -1169,13 +1196,18 @@
 
           if ((usedKey || usedDefault) && this.options.parseMissingKeyHandler) {
             if (this.options.compatibilityAPI !== 'v1') {
-              res = this.options.parseMissingKeyHandler(key, usedDefault ? res : undefined);
+              res = this.options.parseMissingKeyHandler(this.options.appendNamespaceToMissingKey ? "".concat(namespace, ":").concat(key) : key, usedDefault ? res : undefined);
             } else {
               res = this.options.parseMissingKeyHandler(res);
             }
           }
         }
 
+        if (returnDetails) {
+          resolved.res = res;
+          return resolved;
+        }
+
         return res;
       }
     }, {
@@ -1184,7 +1216,7 @@
         var _this3 = this;
 
         if (this.i18nFormat && this.i18nFormat.parse) {
-          res = this.i18nFormat.parse(res, options, resolved.usedLng, resolved.usedNS, resolved.usedKey, {
+          res = this.i18nFormat.parse(res, _objectSpread$2(_objectSpread$2({}, this.options.interpolation.defaultVariables), options), resolved.usedLng, resolved.usedNS, resolved.usedKey, {
             resolved: resolved
           });
         } else if (!options.skipInterpolation) {
@@ -1997,7 +2029,7 @@
             str = str.replace(match[0], safeValue);
 
             if (skipOnVariables) {
-              todo.regex.lastIndex += safeValue.length;
+              todo.regex.lastIndex += value.length;
               todo.regex.lastIndex -= match[0].length;
             } else {
               todo.regex.lastIndex = 0;
@@ -2149,11 +2181,11 @@
               key = _opt$split2[0],
               rest = _opt$split2.slice(1);
 
-          var val = rest.join(':');
-          if (val.trim() === 'false') formatOptions[key.trim()] = false;
-          if (val.trim() === 'true') formatOptions[key.trim()] = true;
-          if (!isNaN(val.trim())) formatOptions[key.trim()] = parseInt(val.trim(), 10);
-          if (!formatOptions[key.trim()]) formatOptions[key.trim()] = val.trim();
+          var val = rest.join(':').trim().replace(/^'+|'+$/g, '');
+          if (!formatOptions[key.trim()]) formatOptions[key.trim()] = val;
+          if (val === 'false') formatOptions[key.trim()] = false;
+          if (val === 'true') formatOptions[key.trim()] = true;
+          if (!isNaN(val)) formatOptions[key.trim()] = parseInt(val, 10);
         });
       }
     }
@@ -2315,12 +2347,10 @@
     }
   }
 
-  function remove(arr, what) {
-    var found = arr.indexOf(what);
-
-    while (found !== -1) {
-      arr.splice(found, 1);
-      found = arr.indexOf(what);
+  function removePending(q, name) {
+    if (q.pending[name] !== undefined) {
+      delete q.pending[name];
+      q.pendingCount--;
     }
   }
 
@@ -2348,6 +2378,9 @@
       _this.languageUtils = services.languageUtils;
       _this.options = options;
       _this.logger = baseLogger.create('backendConnector');
+      _this.waitingReads = [];
+      _this.maxParallelReads = options.maxParallelReads || 10;
+      _this.readingCalls = 0;
       _this.state = {};
       _this.queue = [];
 
@@ -2363,10 +2396,10 @@
       value: function queueLoad(languages, namespaces, options, callback) {
         var _this2 = this;
 
-        var toLoad = [];
-        var pending = [];
-        var toLoadLanguages = [];
-        var toLoadNamespaces = [];
+        var toLoad = {};
+        var pending = {};
+        var toLoadLanguages = {};
+        var toLoadNamespaces = {};
         languages.forEach(function (lng) {
           var hasAllNamespaces = true;
           namespaces.forEach(function (ns) {
@@ -2375,21 +2408,22 @@
             if (!options.reload && _this2.store.hasResourceBundle(lng, ns)) {
               _this2.state[name] = 2;
             } else if (_this2.state[name] < 0) ;else if (_this2.state[name] === 1) {
-              if (pending.indexOf(name) < 0) pending.push(name);
+              if (pending[name] === undefined) pending[name] = true;
             } else {
               _this2.state[name] = 1;
               hasAllNamespaces = false;
-              if (pending.indexOf(name) < 0) pending.push(name);
-              if (toLoad.indexOf(name) < 0) toLoad.push(name);
-              if (toLoadNamespaces.indexOf(ns) < 0) toLoadNamespaces.push(ns);
+              if (pending[name] === undefined) pending[name] = true;
+              if (toLoad[name] === undefined) toLoad[name] = true;
+              if (toLoadNamespaces[ns] === undefined) toLoadNamespaces[ns] = true;
             }
           });
-          if (!hasAllNamespaces) toLoadLanguages.push(lng);
+          if (!hasAllNamespaces) toLoadLanguages[lng] = true;
         });
 
-        if (toLoad.length || pending.length) {
+        if (Object.keys(toLoad).length || Object.keys(pending).length) {
           this.queue.push({
             pending: pending,
+            pendingCount: Object.keys(pending).length,
             loaded: {},
             errors: [],
             callback: callback
@@ -2397,10 +2431,10 @@
         }
 
         return {
-          toLoad: toLoad,
-          pending: pending,
-          toLoadLanguages: toLoadLanguages,
-          toLoadNamespaces: toLoadNamespaces
+          toLoad: Object.keys(toLoad),
+          pending: Object.keys(pending),
+          toLoadLanguages: Object.keys(toLoadLanguages),
+          toLoadNamespaces: Object.keys(toLoadNamespaces)
         };
       }
     }, {
@@ -2419,16 +2453,17 @@
         var loaded = {};
         this.queue.forEach(function (q) {
           pushPath(q.loaded, [lng], ns);
-          remove(q.pending, name);
+          removePending(q, name);
           if (err) q.errors.push(err);
 
-          if (q.pending.length === 0 && !q.done) {
+          if (q.pendingCount === 0 && !q.done) {
             Object.keys(q.loaded).forEach(function (l) {
-              if (!loaded[l]) loaded[l] = [];
+              if (!loaded[l]) loaded[l] = {};
+              var loadedKeys = q.loaded[l];
 
-              if (q.loaded[l].length) {
-                q.loaded[l].forEach(function (ns) {
-                  if (loaded[l].indexOf(ns) < 0) loaded[l].push(ns);
+              if (loadedKeys.length) {
+                loadedKeys.forEach(function (ns) {
+                  if (loaded[l][ns] === undefined) loaded[l][ns] = true;
                 });
               }
             });
@@ -2455,6 +2490,20 @@
         var wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 350;
         var callback = arguments.length > 5 ? arguments[5] : undefined;
         if (!lng.length) return callback(null, {});
+
+        if (this.readingCalls >= this.maxParallelReads) {
+          this.waitingReads.push({
+            lng: lng,
+            ns: ns,
+            fcName: fcName,
+            tried: tried,
+            wait: wait,
+            callback: callback
+          });
+          return;
+        }
+
+        this.readingCalls++;
         return this.backend[fcName](lng, ns, function (err, data) {
           if (err && data && tried < 5) {
             setTimeout(function () {
@@ -2463,6 +2512,14 @@
             return;
           }
 
+          _this3.readingCalls--;
+
+          if (_this3.waitingReads.length > 0) {
+            var next = _this3.waitingReads.shift();
+
+            _this3.read(next.lng, next.ns, next.fcName, next.tried, next.wait, next.callback);
+          }
+
           callback(err, data);
         });
       }
@@ -3185,7 +3242,7 @@
         }
 
         if (this.hasResourceBundle(lng, ns)) return true;
-        if (!this.services.backendConnector.backend) return true;
+        if (!this.services.backendConnector.backend || this.options.resources && !this.options.partialBundledLanguages) return true;
         if (loadNotPending(lng, ns) && (!fallbackLng || loadNotPending(lastLng, ns))) return true;
         return false;
       }
@@ -3355,7 +3412,6 @@
   }
 
   var fetchApi;
-
   if (typeof fetch === 'function') {
     if (typeof global !== 'undefined' && global.fetch) {
       fetchApi = global.fetch;
@@ -3366,7 +3422,6 @@
 
   if (typeof require !== 'undefined' && (typeof window === 'undefined' || typeof window.document === 'undefined')) {
     var f = fetchApi || require('cross-fetch');
-
     if (f.default) f = f.default;
     exports.default = f;
     module.exports = exports.default;
@@ -3397,7 +3452,7 @@
 
   var XmlHttpRequestApi;
 
-  if (hasXMLHttpRequest) {
+  if (hasXMLHttpRequest()) {
     if (typeof global !== 'undefined' && global.XMLHttpRequest) {
       XmlHttpRequestApi = global.XMLHttpRequest;
     } else if (typeof window !== 'undefined' && window.XMLHttpRequest) {
@@ -3525,7 +3580,7 @@
       return requestWithFetch(options, url, payload, callback);
     }
 
-    if (hasXMLHttpRequest || typeof ActiveXObject === 'function') {
+    if (hasXMLHttpRequest() || typeof ActiveXObject === 'function') {
       return requestWithXmlHttpRequest(options, url, payload, callback);
     }
   };
@@ -3651,6 +3706,8 @@
 
         loadPath = makePromise(loadPath);
         loadPath.then(function (resolvedLoadPath) {
+          if (!resolvedLoadPath) return callback(null, {});
+
           var url = _this2.services.interpolator.interpolate(resolvedLoadPath, {
             lng: languages.join('+'),
             ns: namespaces.join('+')
@@ -3904,7 +3961,13 @@
       var found;
 
       if (typeof window !== 'undefined') {
-        var query = window.location.search.substring(1);
+        var search = window.location.search;
+
+        if (!window.location.search && window.location.hash && window.location.hash.indexOf('?') > -1) {
+          search = window.location.hash.substring(window.location.hash.indexOf('?'));
+        }
+
+        var query = search.substring(1);
         var params = query.split('&');
 
         for (var i = 0; i < params.length; i++) {
@@ -5241,7 +5304,7 @@
       simulateItem = simulate[simulateIndex]; // remove items
 
       while (simulateItem === null && simulate.length) {
-        removes.push(remove$1(simulate, simulateIndex, null));
+        removes.push(remove(simulate, simulateIndex, null));
         simulateItem = simulate[simulateIndex];
       }
 
@@ -5251,7 +5314,7 @@
           if (simulateItem && simulateItem.key) {
             // if an insert doesn't put this key in place, it needs to move
             if (bKeys[simulateItem.key] !== k + 1) {
-              removes.push(remove$1(simulate, simulateIndex, simulateItem.key));
+              removes.push(remove(simulate, simulateIndex, simulateItem.key));
               simulateItem = simulate[simulateIndex]; // if the remove didn't put the wanted item in place, we need to insert it
 
               if (!simulateItem || simulateItem.key !== wantedItem.key) {
@@ -5261,8 +5324,8 @@
                 });
               } // items are matching, so skip ahead
               else {
-                simulateIndex++;
-              }
+                  simulateIndex++;
+                }
             } else {
               inserts.push({
                 key: wantedItem.key,
@@ -5279,8 +5342,8 @@
           k++;
         } // a key in simulate has no matching wanted key, remove it
         else if (simulateItem && simulateItem.key) {
-          removes.push(remove$1(simulate, simulateIndex, simulateItem.key));
-        }
+            removes.push(remove(simulate, simulateIndex, simulateItem.key));
+          }
       } else {
         simulateIndex++;
         k++;
@@ -5290,7 +5353,7 @@
 
     while (simulateIndex < simulate.length) {
       simulateItem = simulate[simulateIndex];
-      removes.push(remove$1(simulate, simulateIndex, simulateItem && simulateItem.key));
+      removes.push(remove(simulate, simulateIndex, simulateItem && simulateItem.key));
     } // If the only moves we have are deletes then we can just
     // let the delete patch remove these items.
 
@@ -5311,7 +5374,7 @@
     };
   }
 
-  function remove$1(arr, index, key) {
+  function remove(arr, index, key) {
     arr.splice(index, 1);
     return {
       from: index,
@@ -8189,7 +8252,16 @@
           if (!index || index % 2 === 0) {
             mem.push(match);
           } else {
-            mem.push(translate(match, _objectSpread$7({}, tOptions), overrideKey ? "".concat(overrideKey, ".").concat(attr) : ''));
+            var tr = translate(match, _objectSpread$7({}, tOptions), overrideKey ? "".concat(overrideKey, ".").concat(attr) : '');
+
+            if (tr && tr.indexOf('http') == 0) {
+              // image sources and links seems to be prefixed with the origin hosts
+              if (mem[index - 1] && mem[index - 1].indexOf('http') === 0) {
+                mem.splice(index - 1, 1);
+              }
+            }
+
+            mem.push(tr);
           }
 
           return mem;
@@ -8720,9 +8792,19 @@
       return false;
     }, false);
   }
+  function defer$1() {
+    var res;
+    var rej;
+    var promise = new Promise(function (resolve, reject) {
+      res = resolve;
+      rej = reject;
+    });
+    promise.resolve = res;
+    promise.reject = rej;
+    return promise;
+  }
 
   var fetchApi$2;
-
   if (typeof fetch === 'function') {
     if (typeof global !== 'undefined' && global.fetch) {
       fetchApi$2 = global.fetch;
@@ -8733,7 +8815,6 @@
 
   if (typeof require !== 'undefined' && (typeof window === 'undefined' || typeof window.document === 'undefined')) {
     var f$1 = fetchApi$2 || require('cross-fetch');
-
     if (f$1.default) f$1 = f$1.default;
     exports.default = f$1;
     module.exports = exports.default;
@@ -9110,6 +9191,17 @@
       value: function getLanguages(callback) {
         var _this3 = this;
 
+        var deferred;
+
+        if (!callback) {
+          deferred = defer$1();
+
+          callback = function callback(err, ret) {
+            if (err) return deferred.reject(err);
+            deferred.resolve(ret);
+          };
+        }
+
         var isMissing = isMissingOption(this.options, ['projectId']);
         if (isMissing) return callback(new Error(isMissing));
         var url = interpolate(this.options.getLanguagesPath, {
@@ -9138,6 +9230,18 @@
             });
           }
 
+          if (ret) {
+            var referenceLng = Object.keys(ret).reduce(function (mem, k) {
+              var item = ret[k];
+              if (item.isReferenceLanguage) mem = k;
+              return mem;
+            }, '');
+
+            if (referenceLng && _this3.options.referenceLng !== referenceLng) {
+              _this3.options.referenceLng = referenceLng;
+            }
+          }
+
           _this3.somethingLoaded = true;
           var clbs = _this3.getLanguagesCalls;
           _this3.getLanguagesCalls = [];
@@ -9145,12 +9249,24 @@
             return clb(err, ret);
           });
         });
+        return deferred;
       }
     }, {
       key: "getOptions",
       value: function getOptions(callback) {
         var _this4 = this;
 
+        var deferred;
+
+        if (!callback) {
+          deferred = defer$1();
+
+          callback = function callback(err, ret) {
+            if (err) return deferred.reject(err);
+            deferred.resolve(ret);
+          };
+        }
+
         this.getLanguages(function (err, data) {
           if (err) return callback(err);
           var keys = Object.keys(data);
@@ -9159,11 +9275,6 @@
             return callback(new Error('was unable to load languages via API'));
           }
 
-          var referenceLng = keys.reduce(function (mem, k) {
-            var item = data[k];
-            if (item.isReferenceLanguage) mem = k;
-            return mem;
-          }, '');
           var lngs = keys.reduce(function (mem, k) {
             var item = data[k];
 
@@ -9178,12 +9289,13 @@
             return mem;
           }, false);
           callback(null, {
-            fallbackLng: referenceLng,
-            referenceLng: referenceLng,
+            fallbackLng: _this4.options.referenceLng,
+            referenceLng: _this4.options.referenceLng,
             supportedLngs: lngs,
             load: hasRegion ? 'all' : 'languageOnly'
           }, data);
         });
+        return deferred;
       }
     }, {
       key: "checkIfProjectExists",