Skip to content

Commit b02af5a

Browse files
authored
Merge pull request thingsboard#10183 from jktu2870/PROD-3051
Fix the caption to "Relation types to propagate
2 parents 7277556 + 2013cb3 commit b02af5a

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<mat-icon matChipRemove>close</mat-icon>
7474
</mat-chip-row>
7575
<input matInput type="text" placeholder="{{'device-profile.alarm-rule-relation-types-list' | translate}}"
76-
style="max-width: 200px;"
7776
[matChipInputFor]="relationTypesChipList"
7877
[matChipInputSeparatorKeyCodes]="separatorKeysCodes"
7978
matChipInputAddOnBlur

ui-ngx/src/assets/locale/locale.constant-en_US.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,8 +1674,8 @@
16741674
"alarm-rule-mobile-dashboard-hint": "Used by mobile application as an alarm details dashboard",
16751675
"alarm-rule-no-mobile-dashboard": "No dashboard selected",
16761676
"propagate-alarm": "Propagate alarm to related entities",
1677-
"alarm-rule-relation-types-list": "Relation types to propagate",
1678-
"alarm-rule-relation-types-list-hint": "If Propagate relation types are not selected, alarms will be propagated without filtering by relation type.",
1677+
"alarm-rule-relation-types-list": "Relation types",
1678+
"alarm-rule-relation-types-list-hint": "Defines relation types to filter the related entities. If not set, the alarm will be propagated to all related entities.",
16791679
"propagate-alarm-to-owner": "Propagate alarm to entity owner (Customer or Tenant)",
16801680
"propagate-alarm-to-tenant": "Propagate alarm to Tenant",
16811681
"alarm-rule-condition": "Alarm rule condition",

ui-ngx/src/assets/locale/locale.constant-ko_KR.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,8 +1007,8 @@
10071007
"condition-duration-time-unit-required": "Time unit is required.",
10081008
"advanced-settings": "Advanced settings",
10091009
"propagate-alarm": "Propagate alarm",
1010-
"alarm-rule-relation-types-list": "Relation types to propagate",
1011-
"alarm-rule-relation-types-list-hint": "If Propagate relation types are not selected, alarms will be propagated without filtering by relation type.",
1010+
"alarm-rule-relation-types-list": "Relation types",
1011+
"alarm-rule-relation-types-list-hint": "Defines relation types to filter the related entities. If not set, the alarm will be propagated to all related entities.",
10121012
"alarm-rule-condition": "Alarm rule condition",
10131013
"enter-alarm-rule-condition-prompt": "Please add alarm rule condition",
10141014
"edit-alarm-rule-condition": "Edit alarm rule condition",

ui-ngx/src/assets/locale/locale.constant-sl_SI.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,8 +1007,8 @@
10071007
"condition-duration-time-unit-required": "Time unit is required.",
10081008
"advanced-settings": "Advanced settings",
10091009
"propagate-alarm": "Propagate alarm",
1010-
"alarm-rule-relation-types-list": "Relation types to propagate",
1011-
"alarm-rule-relation-types-list-hint": "If Propagate relation types are not selected, alarms will be propagated without filtering by relation type.",
1010+
"alarm-rule-relation-types-list": "Relation types",
1011+
"alarm-rule-relation-types-list-hint": "Defines relation types to filter the related entities. If not set, the alarm will be propagated to all related entities.",
10121012
"alarm-rule-condition": "Alarm rule condition",
10131013
"enter-alarm-rule-condition-prompt": "Please add alarm rule condition",
10141014
"edit-alarm-rule-condition": "Edit alarm rule condition",

0 commit comments

Comments
 (0)