From 1bc6f5caede59c54767a8b071fff552cb38e363f Mon Sep 17 00:00:00 2001 From: Volker Theile Date: Fri, 15 Feb 2019 14:31:30 +0100 Subject: [PATCH] mgr/dashboard: Remove param when calling notificationService.show The message parameter should be used for error notifications only. Signed-off-by: Volker Theile --- .../iscsi-target-discovery-modal.component.ts | 3 +- .../configuration-form.component.ts | 3 +- .../osd-flags-modal.component.ts | 6 +-- .../osd-recv-speed-modal.component.ts | 5 +-- .../frontend/src/locale/messages.xlf | 44 ++++--------------- 5 files changed, 13 insertions(+), 48 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts index 27b9e186b2a7..50fddfdd521e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts @@ -100,8 +100,7 @@ export class IscsiTargetDiscoveryModalComponent implements OnInit { () => { this.notificationService.show( NotificationType.success, - this.i18n('Discovery authentication was updated.'), - this.i18n('Discovery authentication') + this.i18n('Updated discovery authentication') ); this.bsModalRef.hide(); }, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts index 460f7eaf8eed..11063864b65a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts @@ -177,8 +177,7 @@ export class ConfigurationFormComponent implements OnInit { () => { this.notificationService.show( NotificationType.success, - this.i18n('Config option {{name}} has been updated.', { name: request.name }), - this.i18n('Update config option') + this.i18n('Updated config option {{name}}', { name: request.name }) ); this.router.navigate(['/configuration']); }, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts index b6fd5775afa5..92985516a001 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts @@ -138,11 +138,7 @@ export class OsdFlagsModalComponent implements OnInit { this.osdService.updateFlags(newFlags).subscribe( () => { - this.notificationService.show( - NotificationType.success, - this.i18n('OSD Flags were updated successfully.'), - this.i18n('OSD Flags') - ); + this.notificationService.show(NotificationType.success, this.i18n('Updated OSD Flags')); this.bsModalRef.hide(); }, () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts index 651600edcb89..dcb7db6985f4 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts @@ -230,10 +230,9 @@ export class OsdRecvSpeedModalComponent implements OnInit { () => { this.notificationService.show( NotificationType.success, - this.i18n('OSD recovery speed priority "{{value}}" was set successfully.', { + this.i18n('Updated OSD recovery speed priority "{{value}}"', { value: this.osdRecvSpeedForm.getValue('priority') - }), - this.i18n('OSD recovery speed priority') + }) ); this.bsModalRef.hide(); }, diff --git a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf index 13dad708dbe6..8bfc01f24743 100644 --- a/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf +++ b/src/pybind/mgr/dashboard/frontend/src/locale/messages.xlf @@ -4255,15 +4255,8 @@ 1 - - Discovery authentication was updated. - - src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts - 1 - - - - Discovery authentication + + Updated discovery authentication src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts 1 @@ -4813,15 +4806,8 @@ 1 - - Config option has been updated. - - src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts - 1 - - - - Update config option + + Updated config option src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts 1 @@ -5048,15 +5034,8 @@ 1 - - OSD Flags were updated successfully. - - src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts - 1 - - - - OSD Flags + + Updated OSD Flags src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts 1 @@ -5301,15 +5280,8 @@ 1 - - OSD recovery speed priority "" was set successfully. - - src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts - 1 - - - - OSD recovery speed priority + + Updated OSD recovery speed priority "" src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts 1 -- 2.47.3