@sumaris-net/ngx-components 2.5.3 → 2.5.4

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -9950,13 +9950,9 @@ class MatPaginatorI18n extends MatPaginatorIntl {
     constructor(translate) {
         super();
         this.translate = translate;
-        this.itemsPerPageLabel = 'Items per page';
-        this.nextPageLabel = 'Next page';
-        this.previousPageLabel = 'Previous page';
-        this.getRangeLabel = function (page, pageSize, length) {
-            const of = this.translate ? this.translate.instant('COMMON.PAGINATOR.OF') : 'of';
+        this.getRangeLabel = (page, pageSize, length) => {
             if (length === 0 || pageSize === 0) {
-                return '0 ' + of + ' ' + length;
+                return '0 ' + this.ofLabel + ' ' + length;
             }
             length = Math.max(length, 0);
             const startIndex = page * pageSize;
@@ -9964,17 +9960,25 @@ class MatPaginatorI18n extends MatPaginatorIntl {
             const endIndex = startIndex < length ?
                 Math.min(startIndex + pageSize, length) :
                 startIndex + pageSize;
-            return startIndex + 1 + ' - ' + endIndex + ' ' + of + ' ' + length;
+            return startIndex + 1 + ' - ' + endIndex + ' ' + this.ofLabel + ' ' + length;
         };
-        this.translate = translate;
-        translate.onLangChange.subscribe(() => this.translateLabels());
-        this.translateLabels();
+        this.translate.get([
+            'COMMON.PAGINATOR.ITEMS_PER_PAGE',
+            'COMMON.PAGINATOR.NEXT_PAGE',
+            'COMMON.PAGINATOR.PREVIOUS_PAGE',
+            'COMMON.PAGINATOR.OF',
+        ])
+            .subscribe((translations) => {
+            console.info('[MatPaginatorI18n] Update pagination translations');
+            this.itemsPerPageLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.ITEMS_PER_PAGE', '');
+            this.nextPageLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.NEXT_PAGE', '>');
+            this.previousPageLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.PREVIOUS_PAGE', '<');
+            this.ofLabel = this._getTranslationValue(translations, 'COMMON.PAGINATOR.OF', '/');
+            this.changes.next();
+        });
     }
-    translateLabels() {
-        //console.debug("[i18n] Update pagination translations");
-        this.itemsPerPageLabel = this.translate.instant('COMMON.PAGINATOR.ITEMS_PER_PAGE');
-        this.nextPageLabel = this.translate.instant('COMMON.PAGINATOR.NEXT_PAGE');
-        this.previousPageLabel = this.translate.instant('COMMON.PAGINATOR.PREVIOUS_PAGE');
+    _getTranslationValue(translations, key, defaultValue) {
+        return (translations[key] !== key) ? translations[key] : defaultValue;
     }
 }
 MatPaginatorI18n.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: MatPaginatorI18n, deps: [{ token: i1$2.TranslateService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -26880,7 +26884,7 @@ class AccountPage extends AppForm {
         // Get user options
         this.optionDefinitions = this.accountService.optionDefs.slice();
         // Observed some events
-        this.registerSubscription(this.accountService.onLogin.subscribe(account => this.onLogin(account)));
+        this.registerSubscription(this.accountService.onLogin.pipe(filter(() => !this.saving)).subscribe(account => this.onLogin(account)));
         this.registerSubscription(this.accountService.onLogout.subscribe(() => this.onLogout()));
         this.registerSubscription(this.onCancel.subscribe(() => {
             this.setValue(this.accountService.account);