]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Fix bugs in a unit test and i18n translation 36991/head
authorVolker Theile <vtheile@suse.com>
Fri, 3 Jul 2020 14:09:42 +0000 (16:09 +0200)
committerTatjana Dehler <tdehler@suse.com>
Fri, 11 Sep 2020 09:01:55 +0000 (11:01 +0200)
* SKIP: Unknown argument type: 'BinaryExpression' NodeObject { ... text: 'You can activate the module on the Telemetry configuration '
* WARNING: /ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts:39:32 - get is deprecated: from v9.0.0 use TestBed.inject

Fixes: https://tracker.ceph.com/issues/46371
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 656727a3159ccae7aaaf3ce027b41ad36e3a21d4)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts
Replaced `TestBed.inject` by `TestBed.get` as Angular 9 has not been backported.

src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts

index 974f625e1c6aa3341e058d2b085ba9e0067e605e..4b881e2f8e0b1a86d1830fc4d34bb04c787d75ff 100644 (file)
@@ -61,8 +61,7 @@ export class TelemetryNotificationComponent implements OnInit, OnDestroy {
       NotificationType.success,
       this.i18n('Telemetry activation reminder muted'),
       this.i18n(
-        'You can activate the module on the Telemetry configuration ' +
-          'page (<b>Dashboard Settings</b> -> <b>Telemetry configuration</b>) at any time.'
+        'You can activate the module on the Telemetry configuration page (<b>Dashboard Settings</b> -> <b>Telemetry configuration</b>) at any time.'
       )
     );
   }