Fix: Missing labels in the report views

src/app/deposits/fixed-deposits/fixed-deposit-account-view/view-transaction/view-transaction.component.html

@@ -71,7 +71,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'Back' | translate}}</button>
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'labels.buttons.Back' | translate}}</button>
       </div>
     </mat-card-content>
 

src/app/keyboards-shortcut-config.ts

@@ -57,9 +57,9 @@ export class KeyboardShortcutsConfiguration {
             // Create Client - ctrl + c
             {
                 title: 'Create Client',
-                ctrlKey: true,
+                ctrlKey: false,
                 shiftKey: false,
-                altKey: false,
+                altKey: true,
                 key: 'c',
                 route: 'clients/create'
             },
@@ -120,18 +120,18 @@ export class KeyboardShortcutsConfiguration {
             // Accounting - ctrl + a
             {
                 title: 'Accounting',
-                ctrlKey: true,
+                ctrlKey: false,
                 shiftKey: false,
-                altKey: false,
+                altKey: true,
                 key: 'a',
                 route: 'accounting'
             },
             // Save/Submit Forms - ctrl + s
             {
                 title: 'Save/Submit Forms',
-                ctrlKey: true,
+                ctrlKey: false,
                 shiftKey: false,
-                altKey: false,
+                altKey: true,
                 key: 's',
                 route: '',
                 id: 'submit'
@@ -139,9 +139,9 @@ export class KeyboardShortcutsConfiguration {
             // Cancel - ctrl + x
             {
                 title: 'Cancel',
-                ctrlKey: true,
+                ctrlKey: false,
                 shiftKey: false,
-                altKey: false,
+                altKey: true,
                 key: 'x',
                 route: '',
                 id: 'cancel'
@@ -149,9 +149,9 @@ export class KeyboardShortcutsConfiguration {
             // Help - ctrl + h
             {
                 title: 'Help',
-                ctrlKey: true,
+                ctrlKey: false,
                 shiftKey: false,
-                altKey: false,
+                altKey: true,
                 key: 'h',
                 route: '',
                 id: 'help'

src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.html

@@ -11,7 +11,7 @@
             <td fxFlex="25%" class="left">
               <div [ngClass]="itemStatus(activeTransferData.status)">
                 <fa-icon icon="stop"></fa-icon>
-                <span class="m-l-10 status">{{activeTransferData.status}}</span>
+                <span class="m-l-10 external-asset-owner-status">{{activeTransferData.status}}</span>
               </div>
             </td>
             <td fxFlex="25%">

src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss

@@ -33,7 +33,7 @@
 	margin: 1%;
 }
 
-.status {
+.external-asset-owner-status {
   color: black;
 }
 

src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html

@@ -124,7 +124,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'Back' | translate}}</button>
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'labels.buttons.Back' | translate}}</button>
       </div>
     </mat-card-content>
 

src/app/organization/manage-funds/view-fund/view-fund.component.html

@@ -32,7 +32,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'Back' | translate}}</button>
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'labels.buttons.Back' | translate}}</button>
       </div>
     </mat-card-content>
 

src/app/pipes/yesno.pipe.ts

@@ -1,15 +1,19 @@
 import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 
 @Pipe({
   name: 'yesNo'
 })
 export class YesnoPipe implements PipeTransform {
 
+  constructor(private translateService: TranslateService) { }
+
   transform(value: boolean, ...args: unknown[]): string {
     if (value == null) {
       return null;
     }
-    return value ? 'Yes' : 'No';
+    const result = value ? 'Yes' : 'No';
+    return this.translateService.instant('labels.buttons.' + result);
   }
 
 }

src/app/products/charges/view-charge/view-charge.component.html

@@ -141,7 +141,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'Back' | translate}}</button>
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'labels.buttons.Back' | translate}}</button>
       </div>
     </mat-card-content>
 

src/app/reports/run-report/table-and-sms/table-and-sms.component.html

@@ -41,7 +41,7 @@
   <div class="alert" *ngIf="!hideOutput && toBeExportedToRepo">
     <div class="message">
       <i class="fa fa-exclamation-circle alert-check"></i>
-      {{'labels.text.The report request has been sent and the report will be exported to file repository' | translate}}
+      {{'labels.text.The report request' | translate}}
     </div>
   </div>
 

src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html

@@ -87,7 +87,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../../']">{{ 'Back' |
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../../']">{{ 'labels.buttons.Back' |
           translate}}</button>
       </div>
     </mat-card-content>

src/app/savings/savings-account-view/view-charge/view-charge.component.html

@@ -121,7 +121,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'Back' | translate}}</button>
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'labels.buttons.Back' | translate}}</button>
       </div>
     </mat-card-content>
 

src/app/users/view-user/view-user.component.html

@@ -75,7 +75,7 @@
       </div>
 
       <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="2%" fxLayout.lt-md="column">
-        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'Back' | translate}}</button>
+        <button type="button" mat-raised-button color="primary" [routerLink]="['../']">{{ 'labels.buttons.Back' | translate}}</button>
       </div>
     </mat-card-content>