diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts
index 992036654b..f097d9fb23 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-device-profile-transport-configuration.component.ts
@@ -32,7 +32,6 @@ import { deepClone, isDefinedAndNotNull, isUndefined } from '@core/utils';
import { WINDOW } from '@core/services/window.service';
import { JsonObject } from '@angular/compiler-cli/ngcc/src/packages/entry_point';
import { Direction } from '@shared/models/page/sort-order';
-import { TranslateService } from '@ngx-translate/core';
@Component({
selector: 'tb-profile-lwm2m-device-transport-configuration',
@@ -69,7 +68,6 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro
}
constructor(private store: Store
,
- public translate: TranslateService,
private fb: FormBuilder,
private deviceProfileService: DeviceProfileService,
@Inject(WINDOW) private window: Window) {
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.html
index 3d03987660..7dcd195c7a 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.html
@@ -39,19 +39,19 @@
add
- {{ translate.get('device-profile.lwm2m.valid-id-instance', {
+ {{ 'device-profile.lwm2m.valid-id-instance' | translate: {
count: 2, instance: instanceId, min: instanceIdValueMin
- }) | async }}
+ } }}
- {{ translate.get('device-profile.lwm2m.valid-id-instance', {
+ {{ 'device-profile.lwm2m.valid-id-instance' | translate: {
count: 1, instance: instanceId, max: instanceIdValueMax
- }) | async }}
+ } }}
- {{ translate.get('device-profile.lwm2m.valid-id-instance', {
+ {{ 'device-profile.lwm2m.valid-id-instance' | translate: {
count: 0, instance: instanceId, max: instanceIdValueMax
- }) | async }}
+ } }}
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.ts
index d1f47d4d03..1a0ab08e11 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-add-instances-list.component.ts
@@ -19,7 +19,6 @@ import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Valida
import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { INSTANCES_ID_VALUE_MAX, INSTANCES_ID_VALUE_MIN, KEY_REGEXP_NUMBER } from './profile-config.models';
-import { TranslateService } from '@ngx-translate/core';
import { DeviceProfileService } from '@core/http/device-profile.service';
@Component({
@@ -44,7 +43,6 @@ export class Lwm2mObjectAddInstancesListComponent implements ControlValueAccesso
private propagateChange = (v: any) => { };
constructor(private store: Store,
- public translate: TranslateService,
private deviceProfileService: DeviceProfileService,
private fb: FormBuilder) {
this.instancesListFormGroup = this.fb.group({
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html
index 609af715a8..09297c9400 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html
@@ -44,7 +44,7 @@
- {{ translate.get('device-profile.lwm2m.no-objects-matching', {object: searchText}) | async }}
+ {{ 'device-profile.lwm2m.no-objects-matching' | translate: {object: searchText} }}
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
index 300f95f83f..12be3af48c 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.ts
@@ -22,7 +22,6 @@ import { AppState } from '@core/core.state';
import { Observable } from 'rxjs';
import { filter, map, mergeMap, publishReplay, refCount, tap } from 'rxjs/operators';
import { ModelValue, ObjectLwM2M } from './profile-config.models';
-import { TranslateService } from '@ngx-translate/core';
import { DeviceProfileService } from '@core/http/device-profile.service';
import { Direction } from '@shared/models/page/sort-order';
import { isDefined, isDefinedAndNotNull, isEmptyStr, isString } from '@core/utils';
@@ -72,7 +71,6 @@ export class Lwm2mObjectListComponent implements ControlValueAccessor, OnInit, V
}
constructor(private store: Store,
- public translate: TranslateService,
private deviceProfileService: DeviceProfileService,
private fb: FormBuilder) {
this.lwm2mListFormGroup = this.fb.group({
diff --git a/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.html b/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.html
index 35fad79d8d..bd02c9dee3 100644
--- a/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.html
+++ b/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.html
@@ -52,16 +52,16 @@
{{ 'device.lwm2m-security-config.client-key' | translate }}
- {{ translate.get('device.lwm2m-security-config.pattern_hex_dec', {
+ {{ 'device.lwm2m-security-config.pattern_hex_dec' | translate: {
count: 0
- }) | async }}
+ } }}
{{ 'device.lwm2m-security-config.client-key' | translate }}
- {{ translate.get('device.lwm2m-security-config.pattern_hex_dec', {
+ {{ 'device.lwm2m-security-config.pattern_hex_dec' | translate: {
count: lenMaxClientPublicKeyOrId
- }) | async }}
+ } }}
@@ -83,16 +83,16 @@
{{ 'device.lwm2m-security-config.client-key' | translate }}
- {{ translate.get('device.lwm2m-security-config.pattern_hex_dec', {
+ {{ 'device.lwm2m-security-config.pattern_hex_dec' | translate: {
count: 0
- }) | async }}
+ } }}
{{ 'device.lwm2m-security-config.client-key' | translate }}
- {{ translate.get('device.lwm2m-security-config.pattern_hex_dec', {
+ {{ 'device.lwm2m-security-config.pattern_hex_dec' | translate: {
count: lenMaxClientSecretKey
- }) | async }}
+ } }}
diff --git a/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.ts b/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.ts
index 8d99d3c8d3..a068bb589e 100644
--- a/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/device/lwm2m/security-config-server.component.ts
@@ -31,7 +31,6 @@ import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { PageComponent } from '@shared/components/page.component';
-import { TranslateService } from '@ngx-translate/core';
@Component({
selector: 'tb-security-config-server-lwm2m',
@@ -61,7 +60,6 @@ export class SecurityConfigServerComponent extends PageComponent implements OnIn
constructor(protected store: Store