dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3769 from vvlladd28/bug/alarm-rules/type-hint

Browse Source 
UI: Typo delete invalid alarm-type hint
This commit is contained in:
Igor Kulikov 2020-11-24 16:07:47 +02:00 committed by GitHub
commit e59f1bfdfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarm.component.html
View File

@ -44,8 +44,6 @@
<mat-error *ngIf="alarmFormGroup.get('alarmType').hasError('unique')"> <mat-error *ngIf="alarmFormGroup.get('alarmType').hasError('unique')">
{{ 'device-profile.alarm-type-unique' | translate }} {{ 'device-profile.alarm-type-unique' | translate }}
</mat-error> </mat-error>
<mat-hint *ngIf="!disabled"
innerHTML="{{ 'device-profile.alarm-type-pattern-hint' | translate }}"></mat-hint>
</mat-form-field> </mat-form-field>
</div> </div>
<mat-expansion-panel class="advanced-settings" [expanded]="false"> <mat-expansion-panel class="advanced-settings" [expanded]="false">

1
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -943,7 +943,6 @@
"alarm-type": "Alarm type", "alarm-type": "Alarm type",
"alarm-type-required": "Alarm type is required.", "alarm-type-required": "Alarm type is required.",
"alarm-type-unique": "Alarm type must be unique within the device profile alarm rules.", "alarm-type-unique": "Alarm type must be unique within the device profile alarm rules.",
"alarm-type-pattern-hint": "Alarm type pattern, use <code>${metaKeyName}</code> to substitute variables from metadata",
"create-alarm-pattern": "Create <b>{{alarmType}}</b> alarm", "create-alarm-pattern": "Create <b>{{alarmType}}</b> alarm",
"create-alarm-rules": "Create alarm rules", "create-alarm-rules": "Create alarm rules",
"no-create-alarm-rules": "No create conditions configured", "no-create-alarm-rules": "No create conditions configured",