From 1b6efc52a57f387957d89ab72ad99cc52db97734 Mon Sep 17 00:00:00 2001
From: Tiago Melo <tmelo@suse.com>
Date: Tue, 6 Nov 2018 18:30:47 +0000
Subject: [PATCH] mgr/dashboard: Add missing HTML translations

Signed-off-by: Tiago Melo <tmelo@suse.com>
---
 .../block/mirroring/mirroring.component.html  |  3 ++-
 .../block/rbd-form/rbd-form.component.html    | 17 +++++++++-----
 .../rbd-snapshot-form.component.html          | 11 ++++++----
 .../rbd-snapshot-list.component.html          |  8 ++++---
 .../osd-details/osd-details.component.html    | 22 ++++++++++++-------
 .../osd/osd-list/osd-list.component.html      |  6 +++--
 .../app/core/auth/login/login.component.html  |  9 +++++---
 .../auth/user-form/user-form.component.html   |  6 ++---
 .../notifications.component.html              |  3 +--
 .../task-manager/task-manager.component.html  |  2 +-
 10 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html
index a4e61dc5b127b..4f733b3a8626a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.html
@@ -72,7 +72,8 @@
 </ng-template>
 
 <ng-template #syncTmpl>
-  <span class="label label-info">Syncing</span>
+  <span class="label label-info"
+        i18n>Syncing</span>
 </ng-template>
 
 <ng-template #progressTmpl
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
index e9c50ab38d4c3..1518374ab22f7 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
@@ -76,13 +76,16 @@
                     formControlName="pool"
                     *ngIf="mode !== 'editing' && poolPermission.read">
               <option *ngIf="pools === null"
-                      [ngValue]="null">Loading...
+                      [ngValue]="null"
+                      i18n>Loading...
               </option>
               <option *ngIf="pools !== null && pools.length === 0"
-                      [ngValue]="null">-- No rbd pools available --
+                      [ngValue]="null"
+                      i18n>-- No rbd pools available --
               </option>
               <option *ngIf="pools !== null && pools.length > 0"
-                      [ngValue]="null">-- Select a pool --
+                      [ngValue]="null"
+                      i18n>-- Select a pool --
               </option>
               <option *ngFor="let pool of pools"
                       [value]="pool.pool_name">{{ pool.pool_name }}</option>
@@ -116,7 +119,7 @@
              *ngIf="rbdForm.getValue('useDataPool')">
           <label class="control-label col-sm-3"
                  for="dataPool">
-            Data pool
+            <ng-container i18n>Data pool</ng-container>
             <span class="required"
                   *ngIf="mode !== 'editing'"></span>
             <cd-helper i18n-html
@@ -138,10 +141,12 @@
                     (change)="onDataPoolChange($event.target.value)"
                     *ngIf="mode !== 'editing' && poolPermission.read">
               <option *ngIf="dataPools === null"
-                      [ngValue]="null">Loading...
+                      [ngValue]="null"
+                      i18n>Loading...
               </option>
               <option *ngIf="dataPools !== null && dataPools.length === 0"
-                      [ngValue]="null">-- No data pools available --
+                      [ngValue]="null"
+                      i18n>-- No data pools available --
               </option>
               <option *ngIf="dataPools !== null && dataPools.length > 0"
                       [ngValue]="null">-- Select a data pool --
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.html
index 36effcbe755c5..c987c7fda68a7 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.html
@@ -1,5 +1,6 @@
 <div class="modal-header">
-  <h4 class="modal-title pull-left">{{ editing ? 'Rename' : 'Create' }} RBD Snapshot</h4>
+  <h4 class="modal-title pull-left"
+      i18n>{ editing, select, true {Rename} other {Create}} RBD Snapshot</h4>
   <button type="button"
           class="close pull-right"
           aria-label="Close"
@@ -43,12 +44,14 @@
   <div class="modal-footer">
     <div class="button-group text-right">
       <cd-submit-button [form]="snapshotForm"
-                        (submitAction)="submit()">
-        {{ editing ? 'Rename' : 'Create' }} Snapshot
+                        (submitAction)="submit()"
+                        i18n>
+        { editing, select, true {Rename} other {Create}} Snapshot
       </cd-submit-button>
       <button type="button"
               class="btn btn-sm btn-default"
-              (click)="modalRef.hide()">Close</button>
+              (click)="modalRef.hide()"
+              i18n>Close</button>
     </div>
   </div>
 </form>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.html
index 53237ce7f0575..a1ae6cd0dcbf5 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.html
@@ -13,13 +13,15 @@
 <ng-template #protectTpl
              let-value="value">
   <span *ngIf="value"
-        class="label label-success">PROTECTED</span>
+        class="label label-success"
+        i18n>PROTECTED</span>
   <span *ngIf="!value"
-        class="label label-info">UNPROTECTED</span>
+        class="label label-info"
+        i18n>UNPROTECTED</span>
 </ng-template>
 
 <ng-template #rollbackTpl
              let-value>
-  You are about to rollback
+  <ng-container i18n>You are about to rollback</ng-container>
   <strong>{{ value.snapName }}</strong>.
 </ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
index 1264bad635496..96fc72928db11 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
@@ -1,10 +1,12 @@
 <tabset *ngIf="selection.hasSingleSelection">
-  <tab heading="Attributes (OSD map)">
+  <tab heading="Attributes (OSD map)"
+       i18n-heading>
     <cd-table-key-value *ngIf="osd.loaded"
                         [data]="osd.details.osd_map">
     </cd-table-key-value>
   </tab>
-  <tab heading="Metadata">
+  <tab heading="Metadata"
+       i18n-heading>
     <cd-table-key-value *ngIf="osd.loaded && osd.details.osd_metadata; else noMetaData"
                         (fetchData)="refresh()"
                         [data]="osd.details.osd_metadata">
@@ -15,25 +17,29 @@
       </cd-warning-panel>
     </ng-template>
   </tab>
-  <tab heading="Performance counter">
+  <tab heading="Performance counter"
+       i18n-heading>
     <cd-table-performance-counter *ngIf="osd.loaded"
                                   serviceType="osd"
                                   [serviceId]="osd.id">
     </cd-table-performance-counter>
   </tab>
-  <tab heading="Histogram">
-    <cd-warning-panel i18n *ngIf="osd.loaded && osd.histogram_failed">
+  <tab heading="Histogram"
+       i18n-heading>
+    <cd-warning-panel i18n
+                      *ngIf="osd.loaded && osd.histogram_failed">
       Histogram not available: {{ osd.histogram_failed }}
     </cd-warning-panel>
 
-    <div class="row" *ngIf="osd.loaded && osd.details.histogram">
+    <div class="row"
+         *ngIf="osd.loaded && osd.details.histogram">
       <div class="col-md-6">
-        <h4>Writes</h4>
+        <h4 i18n>Writes</h4>
         <cd-osd-performance-histogram [histogram]="osd.details.histogram.osd.op_w_latency_in_bytes_histogram">
         </cd-osd-performance-histogram>
       </div>
       <div class="col-md-6">
-        <h4>Reads</h4>
+        <h4 i18n>Reads</h4>
         <cd-osd-performance-histogram [histogram]="osd.details.histogram.osd.op_r_latency_out_bytes_histogram">
         </cd-osd-performance-histogram>
       </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
index fb9a17a6ed700..f1ff153f8a469 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
@@ -75,6 +75,8 @@
       {{ safeToDestroyResult.message }}
     </cd-warning-panel>
   </div>
-  <strong>OSD {{ selection.first().id }}</strong> will be
-  <strong>{{ actionDescription }}</strong> if you proceed.
+  <ng-container i18n>
+    <strong>OSD {{ selection.first().id }}</strong> will be
+    <strong>{{ actionDescription }}</strong> if you proceed.
+  </ng-container>
 </ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html
index 554dd5e9235c9..3d9d5ffef65ec 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.html
@@ -30,7 +30,8 @@
                  required
                  autofocus>
           <div class="help-block"
-               *ngIf="(loginForm.submitted || username.dirty) && username.invalid">Username is required</div>
+               *ngIf="(loginForm.submitted || username.dirty) && username.invalid"
+               i18n>Username is required</div>
         </div>
 
         <!-- Password -->
@@ -53,14 +54,16 @@
             </span>
           </div>
           <div class="help-block"
-               *ngIf="(loginForm.submitted || password.dirty) && password.invalid">Password is required
+               *ngIf="(loginForm.submitted || password.dirty) && password.invalid"
+               i18n>Password is required
           </div>
         </div>
 
         <input type="submit"
                class="btn btn-primary btn-block"
                [disabled]="loginForm.invalid"
-               value="Login">
+               value="Login"
+               i18n-value>
       </form>
     </div>
   </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
index daae3dfecf2f9..ea0dc14b53890 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.html
@@ -175,9 +175,9 @@
 </div>
 
 <ng-template #removeSelfUserReadUpdatePermissionTpl>
-  <p><strong>You are about to remove "user read / update" permissions from your own user.</strong></p>
+  <p><strong i18n>You are about to remove "user read / update" permissions from your own user.</strong></p>
   <br>
-  <p>If you continue, you will no longer be able to add or remove roles from any user.</p>
+  <p i18n>If you continue, you will no longer be able to add or remove roles from any user.</p>
 
-  Are you sure you want to continue?
+  <ng-container i18n>Are you sure you want to continue?</ng-container>
 </ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
index 2191b00b766fc..51ecd548ef361 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.html
@@ -1,8 +1,7 @@
 <ng-template #popTemplate>
   <div *ngIf="notifications.length > 0">
     <div class="separator">
-      Recent Notifications
-
+      <ng-container i18n>Recent Notifications</ng-container>
       <div *ngIf="notifications.length > 0"
            class="pull-right">
         <a (click)="removeAll()"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
index bb08c339e6773..344a95c919069 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.html
@@ -72,7 +72,7 @@
   </div>
   <!-- Empty -->
   <div *ngIf="executingTasks.length === 0 && finishedTasks.length === 0">
-    <div class="message">
+    <div class="message" i18n>
       There are no background tasks.
     </div>
   </div>
-- 
2.39.5