@sumaris-net/ngx-components 0.28.4 → 0.28.5

package/bundles/sumaris-net.ngx-components.umd.js

@@ -2860,7 +2860,7 @@
             var contextualKeys = this.contextualKeys(key, context);
             // Return the contextual translation, or default of not exists
             return this.translate.get(contextualKeys, interpolateParams)
-                .pipe(operators.map(function (translations) { return _this.findFirstValid(contextualKeys, translations) || key; }));
+                .pipe(operators.map(function (translations) { return _this.findFirstValid(contextualKeys, translations); }));
         };
         TranslateContextService.prototype.instant = function (key, context, interpolateParams) {
             // No context: do a normal translate
@@ -2869,7 +2869,7 @@
             // Compute a contextual i18n key, using the context as suffix
             var contextualKeys = this.contextualKeys(key, context);
             var translations = this.translate.instant(contextualKeys, interpolateParams);
-            return this.findFirstValid(contextualKeys, translations) || key;
+            return this.findFirstValid(contextualKeys, translations);
         };
         /**
          * Compute contextual i18n keys, using the context as suffix.<br>
@@ -2926,7 +2926,7 @@
                 }
                 finally { if (e_1) throw e_1.error; }
             }
-            return undefined;
+            return translations[keys[keys.length - 1]]; // Return the last keys translation
         };
         return TranslateContextService;
     }());