Skip to content

Commit 27c4ad8

Browse files
committed
Reverts alert names back
1 parent ed78799 commit 27c4ad8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

plugins/alerts/frontend/public/localization/alerts.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ alert.plugin-title = Alerts
55

66
alert.Add_New_Alert=Add New Alert
77
alert.Edit_Your_Alert=Edit Your Alert
8-
alerts.Alert_Name=Alert Name
8+
alert.Alert_Name=Alert Name
99
alert.Event=Events
1010
alert.View=Views
1111
alert.Session=Sessions
@@ -59,9 +59,9 @@ alert.delete-confirm = Confirm to delete this alert?
5959
alert.yes-delete-alert = Yes, delete alert
6060
alert.email-place-holder=Enter emails
6161
alert.enter-alert-name = Enter alert name
62-
alerts.Application = Application
63-
alerts.Condition = Condition
64-
alerts.CreateBy = Created by
62+
alert.Application = Application
63+
alert.Condition = Condition
64+
alert.CreateBy = Created by
6565
alert.compare-remind = Metrics are compared on a daily basis.
6666
alert.add-number = Add Number
6767
alert.make-changes-remind = You made {0} changes.

plugins/alerts/frontend/public/templates/vue-main.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,21 @@
6969
</template>
7070
</el-table-column>
7171

72-
<el-table-column fixed min-width="240" prop="alertName" :label="i18n('alerts.Alert_Name')" sortable="true">
72+
<el-table-column fixed min-width="240" prop="alertName" :label="i18n('alert.Alert_Name')" sortable="true">
7373
<template slot-scope="scope">
7474
<div style="text-overflow: ellipsis; overflow: hidden;" :data-test-id="'datatable-alert-name-' + scope.$index" v-html="scope.row.alertName"></div>
7575
</template>
7676
</el-table-column>
7777

7878
<template v-for="(col, idx) in scope.dynamicCols">
79-
<el-table-column min-width="175" v-if="col.value === 'appNameList'" prop="appNameList" sortable="true" :label="i18n('alerts.Application')">
79+
<el-table-column min-width="175" v-if="col.value === 'appNameList'" prop="appNameList" sortable="true" :label="i18n('alert.Application')">
8080
<template slot-scope="scope">
8181
<div :data-test-id="'datatable-application-' + scope.$index">
8282
{{scope.row.appNameList}}
8383
</div>
8484
</template>
8585
</el-table-column>
86-
<el-table-column min-width="415" v-if="col.value === 'conditionText'" prop="conditionText" sortable="true" :label="i18n('alerts.Condition')">
86+
<el-table-column min-width="415" v-if="col.value === 'conditionText'" prop="conditionText" sortable="true" :label="i18n('alert.Condition')">
8787
<template slot-scope="scope" sortable="true">
8888
<span :data-test-id="'datatable-condition-' + scope.$index">
8989
{{unescapeHtml(scope.row.condtionText)}}
@@ -92,7 +92,7 @@
9292
</el-table-column>
9393
</template>
9494

95-
<el-table-column min-width="130" sortable="true" prop="createdByUser" :label="i18n('alerts.CreateBy')">
95+
<el-table-column min-width="130" sortable="true" prop="createdByUser" :label="i18n('alert.CreateBy')">
9696
<template slot-scope="scope">
9797
<div class="bu-level">
9898
<div class="bu-level-left">

0 commit comments

Comments
 (0)