Skip to content

Commit 42ab323

Browse files
committed
changes to diff message(different for single/multi)
1 parent 368f959 commit 42ab323

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

frontend/express/public/core/app-management/templates/app-management.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@ <h2 class="bu-mb-4" data-test-id="selected-app-name-title"> {{apps[selectedApp]
208208
<div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
209209
<span class="selected-count-blue bu-pl-1 text-medium">
210210
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{compare(formScope.editedObject,apps[selectedApp]).length}}</span>
211-
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
212-
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
211+
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
212+
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
213+
<span v-if="compare(formScope.editedObject,apps[selectedApp]).length" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
214+
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
213215
</span>
214216
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
215217
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="save(formScope.editedObject)">

frontend/express/public/localization/dashboard/dashboard.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,10 @@ common.undo = Undo
261261
common.drawer.next-step = Next step
262262
common.drawer.previous-step = Previous step
263263
common.diff-helper.changes = You made {0} changes.
264+
common.diff-helper.changes-made-single = change has been made.
264265
common.diff-helper.changes-made = changes have been made.
265266
common.diff-helper.keep = Do you want to keep them?
267+
common.diff-helper.keep-single = Do you want to keep it?
266268
common.save-changes = Save Changes
267269
common.discard-changes = Discard
268270
common.complete = Complete

plugins/plugins/frontend/public/templates/configurations.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,10 @@ <h3 v-if="config.groups.length > 1 || group.label" class="bu-my-4">
301301
<div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
302302
<span class="selected-count-blue bu-pl-1 text-medium">
303303
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{diff.length}}</span>
304-
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
305-
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
304+
<span v-if="diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
305+
<span v-elseclass="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
306+
<span v-if="diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
307+
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
306308
</span>
307309
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
308310
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="save">

plugins/plugins/frontend/public/templates/plugins.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@
4444
<div class="bu-mr-0 bu-is-flex bu-is-justify-content-flex-end bu-is-align-items-center cly-vue-user-selected" style="height: 100%;">
4545
<span class="selected-count-blue bu-pl-1 text-medium">
4646
<span style="background-color:#0166D6; color:white; padding:3px 7px; border-radius:4px;">{{scope.diff.length}}</span>
47-
<span class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
48-
<span class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
47+
<span v-if="scope.diff.length>1" class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made") }}</span>
48+
<span v-else class="bu-is-lowercase text-medium color-cool-gray-50 bu-pl-1">{{ i18n("common.diff-helper.changes-made-single") }}</span>
49+
<span v-if="scope.diff.length>1" class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep") }}</span>
50+
<span v-else class="text-medium color-cool-gray-50">{{ i18n("common.diff-helper.keep-single") }}</span>
4951
</span>
5052
<span class="vertical-divider bu-mr-4 bu-ml-4"></span>
5153
<el-button skin="red" class="bu-mr-2" size="small" type="default" @click="updateStatus(scope)">

0 commit comments

Comments
 (0)