andoncloud-prometheus-widget 1.2.0 → 1.2.1

package/dist/index.js

@@ -1713,7 +1713,7 @@ var Translator = function (_EventEmitter) {
             } else {
               var pluralSuffix;
               if (needsPluralHandling) pluralSuffix = _this4.pluralResolver.getSuffix(code, options.count, options);
-              var zeroSuffix = '_zero';
+              var zeroSuffix = "".concat(_this4.options.pluralSeparator, "zero");
 
               if (needsPluralHandling) {
                 finalKeys.push(key + pluralSuffix);
@@ -2649,6 +2649,8 @@ var Connector = function (_EventEmitter) {
     _this.waitingReads = [];
     _this.maxParallelReads = options.maxParallelReads || 10;
     _this.readingCalls = 0;
+    _this.maxRetries = options.maxRetries >= 0 ? options.maxRetries : 5;
+    _this.retryTimeout = options.retryTimeout >= 1 ? options.retryTimeout : 350;
     _this.state = {};
     _this.queue = [];
 
@@ -2755,7 +2757,7 @@ var Connector = function (_EventEmitter) {
       var _this3 = this;
 
       var tried = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
-      var wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 350;
+      var wait = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : this.retryTimeout;
       var callback = arguments.length > 5 ? arguments[5] : undefined;
       if (!lng.length) return callback(null, {});
 
@@ -2773,13 +2775,6 @@ var Connector = function (_EventEmitter) {
 
       this.readingCalls++;
       return this.backend[fcName](lng, ns, function (err, data) {
-        if (err && data && tried < 5) {
-          setTimeout(function () {
-            _this3.read.call(_this3, lng, ns, fcName, tried + 1, wait * 2, callback);
-          }, wait);
-          return;
-        }
-
         _this3.readingCalls--;
 
         if (_this3.waitingReads.length > 0) {
@@ -2788,6 +2783,13 @@ var Connector = function (_EventEmitter) {
           _this3.read(next.lng, next.ns, next.fcName, next.tried, next.wait, next.callback);
         }
 
+        if (err && data && tried < _this3.maxRetries) {
+          setTimeout(function () {
+            _this3.read.call(_this3, lng, ns, fcName, tried + 1, wait * 2, callback);
+          }, wait);
+          return;
+        }
+
         callback(err, data);
       });
     }
@@ -3023,7 +3025,7 @@ var I18n = function (_EventEmitter) {
         options = {};
       }
 
-      if (!options.defaultNS && options.ns) {
+      if (!options.defaultNS && options.defaultNS !== false && options.ns) {
         if (typeof options.ns === 'string') {
           options.defaultNS = options.ns;
         } else if (options.ns.indexOf('translation') < 0) {
@@ -3379,8 +3381,9 @@ var I18n = function (_EventEmitter) {
         options.lng = options.lng || fixedT.lng;
         options.lngs = options.lngs || fixedT.lngs;
         options.ns = options.ns || fixedT.ns;
+        options.keyPrefix = options.keyPrefix || keyPrefix || fixedT.keyPrefix;
         var keySeparator = _this5.options.keySeparator || '.';
-        var resultKey = keyPrefix ? "".concat(keyPrefix).concat(keySeparator).concat(key) : key;
+        var resultKey = options.keyPrefix ? "".concat(options.keyPrefix).concat(keySeparator).concat(key) : key;
         return _this5.t(resultKey, options);
       };
 
@@ -3644,7 +3647,7 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-var LIBRARY_VERSION = '1.2.0';
+var LIBRARY_VERSION = '1.2.1';
 
 var QueriesPeriod;