update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / ceph / block / iscsi / iscsi.component.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts
index a8dc711a832f5851a7c8ef60e5e0d0579f3d392a..89e4d7f3407b3ab5c3f01963fd2076e0d583dc63 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts
@@ -1,11 +1,9 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 
-import { I18n } from '@ngx-translate/i18n-polyfill';
-
-import { IscsiService } from '../../../shared/api/iscsi.service';
-import { CellTemplate } from '../../../shared/enum/cell-template.enum';
-import { DimlessPipe } from '../../../shared/pipes/dimless.pipe';
-import { IscsiBackstorePipe } from '../../../shared/pipes/iscsi-backstore.pipe';
+import { IscsiService } from '~/app/shared/api/iscsi.service';
+import { CellTemplate } from '~/app/shared/enum/cell-template.enum';
+import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe';
+import { IscsiBackstorePipe } from '~/app/shared/pipes/iscsi-backstore.pipe';
 
 @Component({
   selector: 'cd-iscsi',
@@ -28,18 +26,17 @@ export class IscsiComponent implements OnInit {
   constructor(
     private iscsiService: IscsiService,
     private dimlessPipe: DimlessPipe,
-    private iscsiBackstorePipe: IscsiBackstorePipe,
-    private i18n: I18n
+    private iscsiBackstorePipe: IscsiBackstorePipe
   ) {}
 
   ngOnInit() {
     this.gatewaysColumns = [
       {
-        name: this.i18n('Name'),
+        name: $localize`Name`,
         prop: 'name'
       },
       {
-        name: this.i18n('State'),
+        name: $localize`State`,
         prop: 'state',
         flexGrow: 1,
         cellTransformation: CellTemplate.badge,
@@ -51,52 +48,52 @@ export class IscsiComponent implements OnInit {
         }
       },
       {
-        name: this.i18n('# Targets'),
+        name: $localize`# Targets`,
         prop: 'num_targets'
       },
       {
-        name: this.i18n('# Sessions'),
+        name: $localize`# Sessions`,
         prop: 'num_sessions'
       }
     ];
     this.imagesColumns = [
       {
-        name: this.i18n('Pool'),
+        name: $localize`Pool`,
         prop: 'pool'
       },
       {
-        name: this.i18n('Image'),
+        name: $localize`Image`,
         prop: 'image'
       },
       {
-        name: this.i18n('Backstore'),
+        name: $localize`Backstore`,
         prop: 'backstore',
         pipe: this.iscsiBackstorePipe
       },
       {
-        name: this.i18n('Read Bytes'),
+        name: $localize`Read Bytes`,
         prop: 'stats_history.rd_bytes',
         cellTemplate: this.iscsiSparklineTpl
       },
       {
-        name: this.i18n('Write Bytes'),
+        name: $localize`Write Bytes`,
         prop: 'stats_history.wr_bytes',
         cellTemplate: this.iscsiSparklineTpl
       },
       {
-        name: this.i18n('Read Ops'),
+        name: $localize`Read Ops`,
         prop: 'stats.rd',
         pipe: this.dimlessPipe,
         cellTemplate: this.iscsiPerSecondTpl
       },
       {
-        name: this.i18n('Write Ops'),
+        name: $localize`Write Ops`,
         prop: 'stats.wr',
         pipe: this.dimlessPipe,
         cellTemplate: this.iscsiPerSecondTpl
       },
       {
-        name: this.i18n('A/O Since'),
+        name: $localize`A/O Since`,
         prop: 'optimized_since',
         cellTemplate: this.iscsiRelativeDateTpl
       }