create new translate pipe and remove TranslateCatalogPipe

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html

@@ -25,7 +25,7 @@
       <mat-label>{{"labels.inputs.Frequency" | translate}}</mat-label>
       <mat-select required formControlName="loanTermFrequencyType">
         <mat-option *ngFor="let type of termFrequencyTypeData" [value]="type.id">
-          {{ type.value | translateCatalog }}
+          {{ type.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error *ngIf="loansAccountTermsForm.controls.loanTermFrequencyType.hasError('required')">
@@ -81,7 +81,7 @@
       <mat-label>{{"labels.inputs.Frequency" | translate}}</mat-label>
       <mat-select formControlName="repaymentFrequencyType" disabled required>
         <mat-option *ngFor="let repaymentFrequencyType of termFrequencyTypeData" [value]="repaymentFrequencyType.id">
-          {{ repaymentFrequencyType.value | translateCatalog }}
+          {{ repaymentFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -91,7 +91,7 @@
       <mat-select formControlName="repaymentFrequencyNthDayType">
         <mat-option *ngFor="let repaymentFrequencyNthDayType of repaymentFrequencyNthDayTypeData"
           [value]="repaymentFrequencyNthDayType.id">
-          {{ repaymentFrequencyNthDayType.value | translateCatalog }}
+          {{ repaymentFrequencyNthDayType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -101,7 +101,7 @@
       <mat-select formControlName="repaymentFrequencyDayOfWeekType">
         <mat-option *ngFor="let repaymentFrequencyDayOfWeekType of repaymentFrequencyDaysOfWeekTypeData"
           [value]="repaymentFrequencyDayOfWeekType.id">
-          {{ repaymentFrequencyDayOfWeekType.value | translateCatalog }}
+          {{ repaymentFrequencyDayOfWeekType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -119,7 +119,7 @@
         <mat-label>{{'labels.inputs.Frequency' | translate}}</mat-label>
         <mat-select formControlName="interestRateFrequencyType">
           <mat-option *ngFor="let interestRateFrequencyType of interestRateFrequencyTypeData" [value]="interestRateFrequencyType.id">
-            {{ interestRateFrequencyType.value | translateCatalog }}
+            {{ interestRateFrequencyType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -131,7 +131,7 @@
         <mat-label>{{"labels.inputs.Interest method" | translate}}</mat-label>
         <mat-select formControlName="interestType" matTooltip="{{ 'tooltips.The Interest method value' | translate}}">
           <mat-option *ngFor="let interestType of interestTypeData" [value]="interestType.id">
-            {{ interestType.value | translateCatalog }}
+            {{ interestType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
       </mat-form-field>
@@ -140,7 +140,7 @@
         <mat-label>{{"labels.inputs.Amortization" | translate}}</mat-label>
         <mat-select required matTooltip="{{ 'tooltips.The Amortization value' | translate}}" formControlName="amortizationType">
           <mat-option *ngFor="let amortizationType of amortizationTypeData" [value]="amortizationType.id">
-            {{ amortizationType.value | translateCatalog }}
+            {{ amortizationType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error *ngIf="loansAccountTermsForm.controls.amortizationType.hasError('required')">
@@ -167,7 +167,7 @@
           <mat-label>{{"labels.inputs.Interest Method" | translate}}</mat-label>
           <mat-select formControlName="interestType">
             <mat-option *ngFor="let interestType of interestTypeData" [value]="interestType.id">
-              {{ interestType.value | translateCatalog }}
+              {{ interestType.value | translateKey:'catalogs' }}
             </mat-option>
           </mat-select>
         </mat-form-field>
@@ -176,7 +176,7 @@
           <mat-label>{{"labels.inputs.Amortization" | translate}}</mat-label>
           <mat-select required matTooltip="{{ 'tooltips.The Amortization value' | translate}}" formControlName="amortizationType">
             <mat-option *ngFor="let amortizationType of amortizationTypeData" [value]="amortizationType.id">
-              {{ amortizationType.value | translateCatalog }}
+              {{ amortizationType.value | translateKey:'catalogs' }}
             </mat-option>
           </mat-select>
           <mat-error *ngIf="loansAccountTermsForm.controls.amortizationType.hasError('required')">
@@ -194,14 +194,14 @@
 
     <div fxFlex="48%" *ngIf="loanScheduleType">
       <span fxFlex="40%"><p>{{"labels.inputs.Loan Schedule Type" | translate}}</p></span>
-      <span fxFlex="60%"><p>{{ loanScheduleType.value | translateCatalog }}</p></span>
+      <span fxFlex="60%"><p>{{ loanScheduleType.value | translateKey:'catalogs' }}</p></span>
     </div>
 
     <mat-form-field fxFlex="48%">
       <mat-label>{{"labels.inputs.Repayment Strategy" | translate}}</mat-label>
       <mat-select formControlName="transactionProcessingStrategyCode" matTooltip="{{ 'tooltips.The repayment strategy' | translate}}" [disabled]="repaymentStrategyDisabled">
         <mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyOptions" [value]="transactionProcessingStrategy.code">
-          {{ transactionProcessingStrategy.name | translateCatalog }}
+          {{ transactionProcessingStrategy.name | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error *ngIf="loansAccountTermsForm.controls.transactionProcessingStrategyCode.hasError('required')">
@@ -226,7 +226,7 @@
       <mat-select formControlName="interestCalculationPeriodType" matTooltip="{{ 'tooltips.Daily - Will Calculate the interest' | translate}}">
         <mat-option *ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData"
           [value]="interestCalculationPeriodType.id">
-          {{ interestCalculationPeriodType.value | translateCatalog }}
+          {{ interestCalculationPeriodType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -299,7 +299,7 @@
 
     <div fxFlexFill *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
       <span fxFlex="40%">{{"labels.inputs.Days in year" | translate}}</span>
-      <span fxFlex="60%">{{ loansAccountTermsData.daysInYearType.value | translateCatalog }}</span>
+      <span fxFlex="60%">{{ loansAccountTermsData.daysInYearType.value | translateKey:'catalogs' }}</span>
     </div>
 
     <ng-container *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
@@ -311,7 +311,7 @@
 
       <div fxFlexFill *ngIf="loansAccountTermsData?.isInterestRecalculationEnabled">
         <span fxFlex="40%">{{"labels.inputs.Days in month" | translate}}</span>
-        <span fxFlex="60%">{{ loansAccountTermsData.daysInMonthType.value | translateCatalog }}</span>
+        <span fxFlex="60%">{{ loansAccountTermsData.daysInMonthType.value | translateKey:'catalogs' }}</span>
       </div>
 
     </ng-container>
@@ -320,7 +320,7 @@
 
       <div fxFlexFill>
         <span fxFlex="40%">{{"labels.inputs.Interest recalculation compounding on" | translate}}</span>
-        <span fxFlex="60%">{{ loansAccountTermsData.interestRecalculationData.interestRecalculationCompoundingType.value | translateCatalog }}</span>
+        <span fxFlex="60%">{{ loansAccountTermsData.interestRecalculationData.interestRecalculationCompoundingType.value | translateKey:'catalogs' }}</span>
       </div>
 
       <div fxFlexFill>

src/app/loans/loans-view/account-details/account-details.component.html

@@ -5,26 +5,26 @@
 
         <div fxFlexFill>
             <span fxFlex="50%">{{"labels.inputs.Repayment Strategy" | translate}}</span>
-            <span fxFlex="50%">{{ loanDetails.transactionProcessingStrategyName | translateCatalog }}</span>
+            <span fxFlex="50%">{{ loanDetails.transactionProcessingStrategyName | translateKey:'catalogs' }}</span>
         </div>
 
         <div fxFlexFill>
             <span fxFlex="50%">{{"labels.inputs.Repayments" | translate}}</span>
-            <span fxFlex="50%">{{loanDetails.numberOfRepayments}} every {{loanDetails.repaymentEvery}}&nbsp;{{loanDetails.repaymentFrequencyType.value | translateCatalog }}
+            <span fxFlex="50%">{{loanDetails.numberOfRepayments}} every {{loanDetails.repaymentEvery}}&nbsp;{{loanDetails.repaymentFrequencyType.value | translateKey:'catalogs' }}
             <span *ngIf="loanDetails.repaymentFrequencyType?.id == 2 && loanDetails.repaymentFrequencyNthDayType?.id != 0 && loanDetails.repaymentFrequencyDayOfWeekType?.id != 0" class="m-l-10">
-              <span class="m-l-10">{{"labels.commons.on" | translate}}</span>{{loanDetails.repaymentFrequencyNthDayType?.value}}&nbsp;{{loanDetails.repaymentFrequencyDayOfWeekType?.value | translateCatalog }}
+              <span class="m-l-10">{{"labels.commons.on" | translate}}</span>{{loanDetails.repaymentFrequencyNthDayType?.value}}&nbsp;{{loanDetails.repaymentFrequencyDayOfWeekType?.value | translateKey:'catalogs' }}
             </span>
             </span>
         </div>
 
         <div fxFlexFill *ngIf="loanDetails.fixedLength">
             <span fxFlex="50%"> {{"labels.inputs.Fixed Length" | translate}} </span>
-            <span fxFlex="50%"> {{loanDetails.fixedLength}} {{loanDetails.repaymentFrequencyType.value | translateCatalog }}</span>
+            <span fxFlex="50%"> {{loanDetails.fixedLength}} {{loanDetails.repaymentFrequencyType.value | translateKey:'catalogs' }}</span>
         </div>
 
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Amortization" | translate}} </span>
-            <span fxFlex="50%"> {{loanDetails.amortizationType.value | translateCatalog }} </span>
+            <span fxFlex="50%"> {{loanDetails.amortizationType.value | translateKey:'catalogs' }} </span>
         </div>
 
         <div fxFlexFill *ngIf="loanDetails.fixedPrincipalPercentagePerInstallment">
@@ -39,7 +39,7 @@
 
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Interest" | translate}} </span>
-            <span fxFlex="50%"> {{loanDetails.annualInterestRate | formatNumber}} % {{"labels.text.per annum" | translate}} ({{loanDetails.interestRatePerPeriod}} %&nbsp; {{loanDetails.interestRateFrequencyType.value | translateCatalog }}) </span>
+            <span fxFlex="50%"> {{loanDetails.annualInterestRate | formatNumber}} % {{"labels.text.per annum" | translate}} ({{loanDetails.interestRatePerPeriod}} %&nbsp; {{loanDetails.interestRateFrequencyType.value | translateKey:'catalogs' }}) </span>
         </div>
 
         <div fxFlexFill>
@@ -80,7 +80,7 @@
 
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Interest Calculation Period" | translate}}</span>
-            <span fxFlex="50%"> {{loanDetails.interestCalculationPeriodType.value | translateCatalog }} </span>
+            <span fxFlex="50%"> {{loanDetails.interestCalculationPeriodType.value | translateKey:'catalogs' }} </span>
         </div>
 
         <div fxFlexFill>
@@ -135,22 +135,22 @@
 
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Days in year" | translate}}</span>
-            <span fxFlex="50%"> {{loanDetails.daysInYearType.value | translateCatalog }} </span>
+            <span fxFlex="50%"> {{loanDetails.daysInYearType.value | translateKey:'catalogs' }} </span>
         </div>
 
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Days in month" | translate}}</span>
-            <span fxFlex="50%"> {{loanDetails.daysInMonthType.value | translateCatalog }} </span>
+            <span fxFlex="50%"> {{loanDetails.daysInMonthType.value | translateKey:'catalogs' }} </span>
         </div>
 
         <div fxFlexFill *ngIf="loanDetails.isInterestRecalculationEnabled">
             <span fxFlex="50%"> {{"labels.inputs.Interest recalculation compounding on" | translate}}</span>
-            <span fxFlex="50%"> {{loanDetails.interestRecalculationData.interestRecalculationCompoundingType.value | translateCatalog }} </span>
+            <span fxFlex="50%"> {{loanDetails.interestRecalculationData.interestRecalculationCompoundingType.value | translateKey:'catalogs' }} </span>
         </div>
 
         <div fxFlexFill *ngIf="loanDetails.isInterestRecalculationEnabled">
             <span fxFlex="50%"> {{"labels.inputs.Advance payments adjustment type" | translate}}</span>
-            <span fxFlex="50%"> {{loanDetails.interestRecalculationData.rescheduleStrategyType.value | translateCatalog }} </span>
+            <span fxFlex="50%"> {{loanDetails.interestRecalculationData.rescheduleStrategyType.value | translateKey:'catalogs' }} </span>
         </div>
 
         <div fxFlexFill *ngIf="loanDetails.isInterestRecalculationEnabled">

src/app/pipes/pipes.module.ts

@@ -1,25 +1,25 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { StatusLookupPipe } from './status-lookup.pipe';
+import { NgModule } from '@angular/core';
 import { AccountsFilterPipe } from './accounts-filter.pipe';
 import { ChargesFilterPipe } from './charges-filter.pipe';
 import { ChargesPenaltyFilterPipe } from './charges-penalty-filter.pipe';
-import { FindPipe } from './find.pipe';
-import { UrlToStringPipe } from './url-to-string.pipe';
 import { DateFormatPipe } from './date-format.pipe';
 import { DatetimeFormatPipe } from './datetime-format.pipe';
 import { ExternalIdentifierPipe } from './external-identifier.pipe';
+import { FindPipe } from './find.pipe';
 import { FormatNumberPipe } from './format-number.pipe';
-import { YesnoPipe } from './yesno.pipe';
 import { PrettyPrintPipe } from './pretty-print.pipe';
-import { TranslateCatalogPipe } from './translate-catalog.pipe';
+import { StatusLookupPipe } from './status-lookup.pipe';
+import { TranslatePipe } from './translate.pipe';
 import { TruncateTextPipe } from './truncate-text.pipe';
+import { UrlToStringPipe } from './url-to-string.pipe';
+import { YesnoPipe } from './yesno.pipe';
 
 @NgModule({
   imports: [
     CommonModule
   ],
-  declarations: [StatusLookupPipe,
+  declarations: [	StatusLookupPipe,
   AccountsFilterPipe,
   ChargesFilterPipe,
   ChargesPenaltyFilterPipe,
@@ -31,8 +31,9 @@ import { TruncateTextPipe } from './truncate-text.pipe';
   FormatNumberPipe,
   YesnoPipe,
   PrettyPrintPipe,
-  TranslateCatalogPipe,
+  TruncateTextPipe,
-  TruncateTextPipe],
+      TranslatePipe
+   ],
   providers: [StatusLookupPipe,
   AccountsFilterPipe,
   ChargesFilterPipe,
@@ -45,7 +46,7 @@ import { TruncateTextPipe } from './truncate-text.pipe';
   FormatNumberPipe,
   YesnoPipe,
   PrettyPrintPipe,
-  TranslateCatalogPipe,
+  TranslatePipe,
   TruncateTextPipe],
   exports: [StatusLookupPipe,
   AccountsFilterPipe,
@@ -59,7 +60,7 @@ import { TruncateTextPipe } from './truncate-text.pipe';
   FormatNumberPipe,
   YesnoPipe,
   PrettyPrintPipe,
-  TranslateCatalogPipe,
+  TranslatePipe,
   TruncateTextPipe]
 })
 export class PipesModule { }

src/app/pipes/translate-catalog.pipe.ts

@@ -1,15 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-
-@Pipe({
-  name: 'translateCatalog'
-})
-export class TranslateCatalogPipe implements PipeTransform {
-
-  constructor(private translateService: TranslateService) { }
-
-  transform(attributeValue: any, suffix?: string): string {
-    return this.translateService.instant('labels.catalogs.' + attributeValue);
-  }
-
-}

src/app/pipes/translate.pipe.spec.ts

@@ -0,0 +1,11 @@
+/* tslint:disable:no-unused-variable */
+
+import { TestBed, async } from '@angular/core/testing';
+import { TranslatePipe } from './translate.pipe';
+
+describe('Pipe: Translatee', () => {
+  it('create an instance', () => {
+    let pipe = new TranslatePipe();
+    expect(pipe).toBeTruthy();
+  });
+});

src/app/pipes/translate.pipe.ts

@@ -0,0 +1,16 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+@Pipe({
+  name: 'translateKey'
+})
+export class TranslatePipe implements PipeTransform {
+
+  constructor(private translateService: TranslateService) { }
+
+  transform(attributeValue: any, group: string, prefix: string = 'labels'): string {
+    const translationKey = `${prefix}.${group}.${attributeValue}`;
+    return this.translateService.instant(translationKey);
+  }
+
+}

src/app/products/charges/charges.component.html

@@ -17,7 +17,7 @@
     <mat-form-field fxFlex fxFlex="28%">
       <mat-select placeholder="{{'labels.inputs.Filter' | translate}}" (selectionChange)="filterByAppliesTo($event.value)">
         <mat-option *ngFor="let chargeAppliesTo of chargeAppliesToOptions" [value]="chargeAppliesTo.id">
-          {{ chargeAppliesTo.value | translateCatalog }}
+          {{ chargeAppliesTo.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -34,17 +34,17 @@
 
       <ng-container matColumnDef="chargeAppliesTo">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Applies To" | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.chargeAppliesTo.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.chargeAppliesTo.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Time" | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> {{"labels.inputs.Calculation" | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="amount">

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

@@ -13,7 +13,7 @@
             <mat-select required formControlName="chargeAppliesTo">
               <mat-option *ngFor="let chargeAppliesTo of chargesTemplateData.chargeAppliesToOptions"
                 [value]="chargeAppliesTo.id">
-                {{ chargeAppliesTo.value | translateCatalog }}
+                {{ chargeAppliesTo.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargeAppliesTo.hasError('required')">
@@ -50,7 +50,7 @@
               <mat-label>{{"labels.inputs.Charge Time Type" | translate}}</mat-label>
               <mat-select required formControlName="chargeTimeType">
                 <mat-option *ngFor="let chargeTimeType of chargeTimeTypeData" [value]="chargeTimeType.id">
-                  {{ chargeTimeType.value | translateCatalog }}
+                  {{ chargeTimeType.value | translateKey:'catalogs' }}
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.chargeTimeType.hasError('required')">
@@ -63,7 +63,7 @@
               <mat-select required formControlName="chargeCalculationType">
                 <mat-option *ngFor="let chargeCalculationType of filteredChargeCalculationType()"
                   [value]="chargeCalculationType.id">
-                  {{ chargeCalculationType.value | translateCatalog }}
+                  {{ chargeCalculationType.value | translateKey:'catalogs' }}
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.chargeCalculationType.hasError('required')">
@@ -76,7 +76,7 @@
               <mat-select required formControlName="chargePaymentMode">
                 <mat-option *ngFor="let chargePaymentMode of chargesTemplateData.chargePaymetModeOptions"
                   [value]="chargePaymentMode.id">
-                  {{ chargePaymentMode.value | translateCatalog }}
+                  {{ chargePaymentMode.value | translateKey:'catalogs' }}
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.chargePaymentMode.hasError('required')">
@@ -110,7 +110,7 @@
               <mat-select required formControlName="feeFrequency">
                 <mat-option *ngFor="let feeFrequency of chargesTemplateData.feeFrequencyOptions"
                   [value]="feeFrequency.id">
-                  {{ feeFrequency.value | translateCatalog }}
+                  {{ feeFrequency.value | translateKey:'catalogs' }}
                 </mat-option>
               </mat-select>
               <mat-error *ngIf="chargeForm.controls.feeFrequency.hasError('required')">

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

@@ -13,7 +13,7 @@
             <mat-select required formControlName="chargeAppliesTo">
               <mat-option *ngFor="let chargeAppliesTo of chargeData.chargeAppliesToOptions"
                 [value]="chargeAppliesTo.id">
-                {{ chargeAppliesTo.value | translateCatalog }}
+                {{ chargeAppliesTo.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -47,7 +47,7 @@
             <mat-label>{{"labels.inputs.Charge Time Type" | translate}}</mat-label>
             <mat-select required formControlName="chargeTimeType">
               <mat-option *ngFor="let chargeTime of chargeTimeTypeOptions" [value]="chargeTime.id">
-                {{ chargeTime.value | translateCatalog }}
+                {{ chargeTime.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargeTimeType.hasError('required')">
@@ -60,7 +60,7 @@
             <mat-label>{{"labels.inputs.Charge Calculation" | translate}}</mat-label>
             <mat-select required formControlName="chargeCalculationType">
               <mat-option *ngFor="let chargeCalculation of chargeCalculationTypeOptions" [value]="chargeCalculation.id">
-                {{ chargeCalculation.value | translateCatalog }}
+                {{ chargeCalculation.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargeCalculationType.hasError('required')">
@@ -73,7 +73,7 @@
             <mat-select required formControlName="chargePaymentMode">
               <mat-option *ngFor="let chargePaymentMode of chargeData.chargePaymetModeOptions"
                 [value]="chargePaymentMode.id">
-                {{ chargePaymentMode.value | translateCatalog }}
+                {{ chargePaymentMode.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.chargePaymentMode.hasError('required')">
@@ -144,7 +144,7 @@
             <mat-label>{{"labels.inputs.Charge Frequency" | translate}}</mat-label>
             <mat-select required formControlName="feeFrequency">
               <mat-option *ngFor="let chargeFrequency of chargeData.feeFrequencyOptions" [value]="chargeFrequency.id">
-                {{ chargeFrequency.value | translateCatalog }}
+                {{ chargeFrequency.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
             <mat-error *ngIf="chargeForm.controls.feeFrequency.hasError('required')">

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

@@ -30,7 +30,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.chargeAppliesTo.value | translateCatalog }}
+          {{ chargeData.chargeAppliesTo.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
@@ -78,7 +78,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.chargeTimeType.value | translateCatalog }}
+          {{ chargeData.chargeTimeType.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
@@ -86,7 +86,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.chargeCalculationType.value | translateCatalog }}
+          {{ chargeData.chargeCalculationType.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
@@ -94,7 +94,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.chargePaymentMode.value | translateCatalog }}
+          {{ chargeData.chargePaymentMode.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
@@ -111,7 +111,7 @@
 
         <div fxFlex="50%"
           *ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeFrequency && chargeData.feeFrequency">
-          {{ chargeData.feeFrequency.value | translateCatalog }}
+          {{ chargeData.feeFrequency.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="chargeData.chargeTimeType.id == 9 && chargeData.feeInterval">

src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html

@@ -96,7 +96,7 @@
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Installment day calculation from' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.repaymentStartDateType?.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.repaymentStartDateType?.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
@@ -117,7 +117,7 @@
     <span  fxFlex="53%">{{ loanProduct.interestRatePerPeriod + ' (Min: ' + (loanProduct.minInterestRatePerPeriod ?
       loanProduct.minInterestRatePerPeriod : loanProduct.interestRatePerPeriod) + ', Max: ' +
       (loanProduct.maxInterestRatePerPeriod ? loanProduct.maxInterestRatePerPeriod : loanProduct.interestRatePerPeriod)
-      + ')'}} {{ loanProduct.interestRateFrequencyType?.value | translateCatalog }}</span>
+      + ')'}} {{ loanProduct.interestRateFrequencyType?.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill *ngIf="loanProduct.isLinkedToFloatingInterestRates" fxLayout="row wrap" fxLayout.lt-md="column">
@@ -148,7 +148,7 @@
       <ng-container matColumnDef="valueConditionType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Condition' | translate}} </th>
         <td mat-cell *matCellDef="let variation">
-          {{ variation.valueConditionType.value | translateCatalog }}
+          {{ variation.valueConditionType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -197,7 +197,7 @@
       <ng-container matColumnDef="valueConditionType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Condition' | translate}} </th>
         <td mat-cell *matCellDef="let variation">
-          {{ variation.valueConditionType.value | translateCatalog }}
+          {{ variation.valueConditionType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -246,7 +246,7 @@
       <ng-container matColumnDef="valueConditionType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Condition' | translate}} </th>
         <td mat-cell *matCellDef="let variation">
-          {{ variation.valueConditionType.value | translateCatalog }}
+          {{ variation.valueConditionType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -287,12 +287,12 @@
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Repay Every' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.repaymentEvery }} {{ loanProduct.repaymentFrequencyType.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.repaymentEvery }} {{ loanProduct.repaymentFrequencyType.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill *ngIf="loanProduct.fixedLength">
     <span fxFlex="47%">{{ 'labels.inputs.Fixed Length' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.fixedLength }} {{ loanProduct.repaymentFrequencyType.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.fixedLength }} {{ loanProduct.repaymentFrequencyType.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill *ngIf="loanProduct.minimumDaysBetweenDisbursalAndFirstRepayment">
@@ -306,7 +306,7 @@
 
   <div fxFlexFill *ngIf="loanProduct.amortizationType?.value">
     <span fxFlex="47%">{{ 'labels.inputs.Amortization' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.amortizationType.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.amortizationType.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
@@ -316,12 +316,12 @@
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Interest Method' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.interestType?.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.interestType?.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Interest Calculation Period' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.interestCalculationPeriodType?.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.interestCalculationPeriodType?.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill *ngIf="loanProduct.allowPartialPeriodInterestCalculation">
@@ -335,12 +335,12 @@
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Loan Schedule Type' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.loanScheduleType.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.loanScheduleType.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Repayment Strategy' | translate}}:</span>
-    <span  fxFlex="53%" class="repayment-strategy">{{ loanProduct.transactionProcessingStrategyName | translateCatalog }}</span>
+    <span  fxFlex="53%" class="repayment-strategy">{{ loanProduct.transactionProcessingStrategyName | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill *ngIf="isAdvancedPaymentAllocation">
@@ -431,12 +431,12 @@
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Days in year' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.daysInYearType?.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.daysInYearType?.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
     <span fxFlex="47%">{{ 'labels.inputs.Days in month' | translate}}:</span>
-    <span  fxFlex="53%">{{ loanProduct.daysInMonthType?.value | translateCatalog }}</span>
+    <span  fxFlex="53%">{{ loanProduct.daysInMonthType?.value | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
@@ -655,7 +655,7 @@
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Charge Type' | translate }} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeCalculationType.value | translateCatalog }}
+          {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -669,7 +669,7 @@
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' | translate }} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeTimeType.value | translateCatalog }}
+          {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -694,7 +694,7 @@
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Charge Type' | translate }} </th>
         <td mat-cell *matCellDef="let overdueCharge">
-          {{ overdueCharge.chargeCalculationType.value | translateCatalog }}
+          {{ overdueCharge.chargeCalculationType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -708,7 +708,7 @@
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef> {{ 'labels.inputs.Collected On' | translate }} </th>
         <td mat-cell *matCellDef="let overdueCharge">
-          {{ overdueCharge.chargeTimeType.value | translateCatalog }}
+          {{ overdueCharge.chargeTimeType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 

src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.html

@@ -31,7 +31,7 @@
     <ng-container matColumnDef="chargeCalculationType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeCalculationType.value | translateCatalog }}
+        {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 
@@ -45,7 +45,7 @@
     <ng-container matColumnDef="chargeTimeType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeTimeType.value | translateCatalog }}
+        {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 
@@ -100,7 +100,7 @@
     <ng-container matColumnDef="chargeCalculationType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
       <td mat-cell *matCellDef="let overdueCharge">
-        {{ overdueCharge.chargeCalculationType.value | translateCatalog }}
+        {{ overdueCharge.chargeCalculationType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 
@@ -114,7 +114,7 @@
     <ng-container matColumnDef="chargeTimeType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
       <td mat-cell *matCellDef="let overdueCharge">
-        {{ overdueCharge.chargeTimeType.value | translateCatalog }}
+        {{ overdueCharge.chargeTimeType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 

src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html

@@ -26,7 +26,7 @@
 
       <ng-container matColumnDef="allocationRule">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Payment Allocation Rule' | translate }}</th>
-        <td mat-cell *matCellDef="let paymentAllocation"> {{ paymentAllocation.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let paymentAllocation"> {{ paymentAllocation.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
@@ -52,7 +52,7 @@
 
       <ng-container matColumnDef="allocationRule">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Credit Allocation Rule' | translate }}</th>
-        <td mat-cell *matCellDef="let creditAllocation"> {{ creditAllocation.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let creditAllocation"> {{ creditAllocation.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
@@ -65,7 +65,7 @@
     <mat-select [formControl]="futureInstallmentAllocationRule">
       <mat-option *ngFor="let futureInstallmentAllocationRule of advancedPaymentAllocation.futureInstallmentAllocationRules"
         [value]="futureInstallmentAllocationRule.code">
-        {{ futureInstallmentAllocationRule.value | translateCatalog }}
+        {{ futureInstallmentAllocationRule.value | translateKey:'catalogs' }}
       </mat-option>
     </mat-select>
   </mat-form-field>

src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html

@@ -3,7 +3,7 @@
 
     <mat-tab *ngFor="let advancedPaymentAllocation of advancedPaymentAllocations">
         <ng-template mat-tab-label>
-            {{advancedPaymentAllocation.transaction.value | translateCatalog}}
+            {{advancedPaymentAllocation.transaction.value | translateKey:'catalogs'}}
         </ng-template>
         <mifosx-advance-payment-allocation-tab [advancedPaymentAllocation]="advancedPaymentAllocation"
             (allocationChanged)="allocationChanged($event)"
@@ -13,7 +13,7 @@
 
     <mat-tab *ngFor="let advancedCreditAllocation of advancedCreditAllocations">
         <ng-template mat-tab-label>
-            {{advancedCreditAllocation.transaction.value | translateCatalog}}
+            {{advancedCreditAllocation.transaction.value | translateKey:'catalogs'}}
         </ng-template>
         <mifosx-advance-payment-allocation-tab [advancedCreditAllocation]="advancedCreditAllocation"
             (allocationChanged)="allocationChanged($event)"

src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html

@@ -18,7 +18,7 @@
       <mat-label>{{'labels.inputs.Interest Method' | translate}}</mat-label>
       <mat-select formControlName="interestType" matTooltip="The Interest method value is input to calculating the payments amount for repayment of the loan. " required>
         <mat-option *ngFor="let interestType of interestTypeData" [value]="interestType.id">
-          {{ interestType.value | translateCatalog }}
+          {{ interestType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -31,7 +31,7 @@
       <mat-select formControlName="interestCalculationPeriodType" matTooltip="Daily - Will Calculate the interest on DAILY basis ex: Month of February has 28days
       and it will calculate interest for 28days, SAME AS REPAYMENT PERIOD- it calculates for the month,that is, 30days." required>
         <mat-option *ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData" [value]="interestCalculationPeriodType.id">
-          {{ interestCalculationPeriodType.value | translateCatalog }}
+          {{ interestCalculationPeriodType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -58,7 +58,7 @@
       <mat-label>{{'labels.inputs.Loan Schedule Type' | translate}}</mat-label>
       <mat-select formControlName="loanScheduleType" required>
         <mat-option *ngFor="let loanScheduleType of loanScheduleTypeData" [value]="loanScheduleType.code">
-          {{ loanScheduleType.value | translateCatalog }}
+          {{ loanScheduleType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -68,7 +68,7 @@
       <mat-select formControlName="transactionProcessingStrategyCode" matTooltip="The repayment strategy determines the sequence in which each of the components is paid."
         required [disabled]="advancedTransactionProcessingStrategyDisabled">
         <mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData" [value]="transactionProcessingStrategy.code">
-          {{ transactionProcessingStrategy.name | translateCatalog }}
+          {{ transactionProcessingStrategy.name | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -80,7 +80,7 @@
       <mat-label>{{'labels.inputs.Loan Schedule Processing Type' | translate}}</mat-label>
       <mat-select formControlName="loanScheduleProcessingType" required>
         <mat-option *ngFor="let loanScheduleProcessingType of loanScheduleProcessingTypeData" [value]="loanScheduleProcessingType.code">
-          {{ loanScheduleProcessingType.value | translateCatalog }}
+          {{ loanScheduleProcessingType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -189,7 +189,7 @@
       <mat-label>{{'labels.inputs.Days in year' | translate}}</mat-label>
       <mat-select matTooltip="The setting for number of days in year to use to calculate interest" formControlName="daysInYearType" required>
         <mat-option *ngFor="let daysInYearType of daysInYearTypeData" [value]="daysInYearType.id">
-          {{ daysInYearType.value | translateCatalog }}
+          {{ daysInYearType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -201,7 +201,7 @@
       <mat-label>{{'labels.inputs.Days in month' | translate}}</mat-label>
       <mat-select matTooltip="Number of days in month." formControlName="daysInMonthType" required>
         <mat-option *ngFor="let daysInMonthType of daysInMonthTypeData" [value]="daysInMonthType.id">
-          {{ daysInMonthType.value | translateCatalog }}
+          {{ daysInMonthType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -282,7 +282,7 @@
         <mat-label>{{'labels.inputs.Pre-closure interest calculation rule' | translate}}</mat-label>
         <mat-select formControlName="preClosureInterestCalculationStrategy" required>
           <mat-option *ngFor="let preClosureInterestCalculationStrategy of preClosureInterestCalculationStrategyData" [value]="preClosureInterestCalculationStrategy.id">
-            {{ preClosureInterestCalculationStrategy.value | translateCatalog }}
+            {{ preClosureInterestCalculationStrategy.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -294,7 +294,7 @@
         <mat-label>{{'labels.inputs.Advance payments adjustment type' | translate}}</mat-label>
         <mat-select formControlName="rescheduleStrategyMethod" required>
           <mat-option *ngFor="let rescheduleStrategyType of rescheduleStrategyTypeData" [value]="rescheduleStrategyType.id">
-            {{ rescheduleStrategyType.value | translateCatalog }}
+            {{ rescheduleStrategyType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -306,7 +306,7 @@
         <mat-label>{{'labels.inputs.Interest recalculation compounding on' | translate}}</mat-label>
         <mat-select formControlName="interestRecalculationCompoundingMethod" required>
           <mat-option *ngFor="let interestRecalculationCompoundingType of interestRecalculationCompoundingTypeData" [value]="interestRecalculationCompoundingType.id">
-            {{ interestRecalculationCompoundingType.value | translateCatalog }}
+            {{ interestRecalculationCompoundingType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -352,7 +352,7 @@
           <mat-form-field fxFlexFill>
             <mat-select formControlName="recalculationCompoundingFrequencyNthDayType">
               <mat-option *ngFor="let interestRecalculationNthDayType of interestRecalculationNthDayTypeData" [value]="interestRecalculationNthDayType.id">
-                {{ interestRecalculationNthDayType.value | translateCatalog }}
+                {{ interestRecalculationNthDayType.value | translateKey:'catalogs' }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -365,7 +365,7 @@
           <mat-form-field fxFlexFill>
               <mat-select formControlName="recalculationCompoundingFrequencyDayOfWeekType">
                 <mat-option *ngFor="let interestRecalculationDayOfWeekType of interestRecalculationDayOfWeekTypeData" [value]="interestRecalculationDayOfWeekType.id">
-                  {{ interestRecalculationDayOfWeekType.value | translateCatalog }}
+                  {{ interestRecalculationDayOfWeekType.value | translateKey:'catalogs' }}
                 </mat-option>
               </mat-select>
             </mat-form-field>
@@ -391,7 +391,7 @@
         <mat-label>{{'labels.inputs.Frequency for recalculate Outstanding Principal' | translate}}</mat-label>
         <mat-select formControlName="recalculationRestFrequencyType" required>
           <mat-option *ngFor="let interestRecalculationFrequencyType of interestRecalculationFrequencyTypeData" [value]="interestRecalculationFrequencyType.id">
-            {{ interestRecalculationFrequencyType.value | translateCatalog }}
+            {{ interestRecalculationFrequencyType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -404,7 +404,7 @@
         <mat-form-field fxFlexFill>
           <mat-select formControlName="recalculationRestFrequencyNthDayType">
             <mat-option *ngFor="let interestRecalculationNthDayType of interestRecalculationNthDayTypeData" [value]="interestRecalculationNthDayType.id">
-              {{ interestRecalculationNthDayType.value | translateCatalog }}
+              {{ interestRecalculationNthDayType.value | translateKey:'catalogs' }}
             </mat-option>
           </mat-select>
         </mat-form-field>
@@ -417,7 +417,7 @@
         <mat-form-field fxFlexFill>
           <mat-select formControlName="recalculationRestFrequencyDayOfWeekType">
             <mat-option *ngFor="let interestRecalculationDayOfWeekType of interestRecalculationDayOfWeekTypeData" [value]="interestRecalculationDayOfWeekType.id">
-              {{ interestRecalculationDayOfWeekType.value | translateCatalog }}
+              {{ interestRecalculationDayOfWeekType.value | translateKey:'catalogs' }}
             </mat-option>
           </mat-select>
         </mat-form-field>

src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html

@@ -37,7 +37,7 @@
         <mat-label>{{'labels.inputs.Over Amount Calculation Type' | translate}}</mat-label>
         <mat-select formControlName="overAppliedCalculationType" required>
           <mat-option *ngFor="let overAppliedCalculationType of overAppliedCalculationTypeData" [value]="overAppliedCalculationType.id">
-            {{ overAppliedCalculationType.value | translateCatalog }}
+            {{ overAppliedCalculationType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
       </mat-form-field>
@@ -52,7 +52,7 @@
       <mat-label>{{'labels.inputs.Installment day calculation from' | translate}} <i class="fas fa-question" matTooltip="Repayment schedule will start the installment dates from the submitted date or the disbursement date"></i></mat-label>
       <mat-select formControlName="repaymentStartDateType" required>
         <mat-option *ngFor="let repaymentStartDateType of repaymentStartDateTypeOptions" [value]="repaymentStartDateType.id">
-          {{ repaymentStartDateType.value | translateCatalog}}
+          {{ repaymentStartDateType.value | translateKey:'catalogs'}}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -127,7 +127,7 @@
         <mat-label>{{'labels.inputs.Frequency' | translate}}</mat-label>
         <mat-select formControlName="interestRateFrequencyType" required [disabled]="isZeroInterest()">
           <mat-option *ngFor="let interestRateFrequencyType of interestRateFrequencyTypeData" [value]="interestRateFrequencyType.id">
-            {{ interestRateFrequencyType.value | translateCatalog }}
+            {{ interestRateFrequencyType.value | translateKey:'catalogs' }}
           </mat-option>
         </mat-select>
         <mat-error>
@@ -408,7 +408,7 @@
       <mat-label>{{'labels.inputs.Frequency Type' | translate}}</mat-label>
       <mat-select formControlName="repaymentFrequencyType" required>
         <mat-option *ngFor="let repaymentFrequencyType of repaymentFrequencyTypeData" [value]="repaymentFrequencyType.id">
-          {{ repaymentFrequencyType.value | translateCatalog }}
+          {{ repaymentFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -423,7 +423,7 @@
       <mat-label>{{'labels.inputs.Fixed Length' | translate}}</mat-label>
       <input type="number" matInput formControlName="fixedLength">
     </mat-form-field>
-    <span fxFlex="30%" *ngIf="allowFixedLength()" class="label-field">{{ loanProductTermsForm.value.repaymentFrequencyType | find:repaymentFrequencyTypeData:'id':'value' | translateCatalog }}</span>
+    <span fxFlex="30%" *ngIf="allowFixedLength()" class="label-field">{{ loanProductTermsForm.value.repaymentFrequencyType | find:repaymentFrequencyTypeData:'id':'value' | translateKey:'catalogs' }}</span>
 
     <mat-form-field fxFlex="48%">
       <mat-label>{{'labels.inputs.Minimum days between disbursal and first repayment date' | translate}}</mat-label>

src/app/products/loan-products/view-loan-product/shared/view-advance-paymeny-allocation/view-advance-paymeny-allocation.component.html

@@ -12,7 +12,7 @@
 
     <div fxFlexFill>
       <span fxFlex="40%">{{ 'labels.inputs.Future Installment Allocation Rule' | translate }}:</span>
-      <span fxFlex="60%">{{ futureInstallmentRuleValue(paymentAllocation.futureInstallmentAllocationRule) | translateCatalog }}</span>
+      <span fxFlex="60%">{{ futureInstallmentRuleValue(paymentAllocation.futureInstallmentAllocationRule) | translateKey:'catalogs' }}</span>
     </div>
 
     <div fxFlexFill>
@@ -28,7 +28,7 @@
           <tbody>
             <tr *ngFor="let paymentAllocation of paymentAllocation.paymentAllocationOrder; let idx = index;">
               <td>{{ (idx + 1) }}</td>
-              <td>{{ allocationRuleValue(paymentAllocation.paymentAllocationRule) | translateCatalog }}</td>
+              <td>{{ allocationRuleValue(paymentAllocation.paymentAllocationRule) | translateKey:'catalogs' }}</td>
             </tr>
           </tbody>
         </table>
@@ -61,7 +61,7 @@
           <tbody>
             <tr *ngFor="let creditAllocation of creditAllocation.creditAllocationOrder; let idx = index;">
               <td>{{ (idx + 1) }}</td>
-              <td>{{ allocationRuleValue(creditAllocation.creditAllocationRule) | translateCatalog}}</td>
+              <td>{{ allocationRuleValue(creditAllocation.creditAllocationRule) | translateKey:'catalogs'}}</td>
             </tr>
           </tbody>
         </table>

src/app/products/manage-tax-components/create-tax-component/create-tax-component.component.html

@@ -34,7 +34,7 @@
             <mat-label>{{'labels.inputs.Debit Account Type' | translate}}</mat-label>
             <mat-select formControlName="debitAccountType">
               <mat-option *ngFor="let debitAccountType of debitAccountTypeData" [value]="debitAccountType.id">
-                {{ debitAccountType.value | translateCatalog }}
+                {{ debitAccountType.value | translateKey:'inputs.accounting' }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -48,7 +48,7 @@
             <mat-label>{{'labels.inputs.Credit Account Type' | translate}}</mat-label>
             <mat-select formControlName="creditAccountType">
               <mat-option *ngFor="let creditAccountType of creditAccountTypeData" [value]="creditAccountType.id">
-                {{ creditAccountType.value | translateCatalog }}
+                {{ creditAccountType.value | translateKey:'inputs.accounting' }}
               </mat-option>
             </mat-select>
           </mat-form-field>

src/app/products/manage-tax-components/view-tax-component/view-tax-component.component.html

@@ -50,7 +50,7 @@
         </div>
 
         <div fxFlex="50%" *ngIf="taxComponentData.creditAccountType">
-          {{ taxComponentData.creditAccountType.value | translateCatalog }}
+          {{ taxComponentData.creditAccountType.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong" *ngIf="taxComponentData.creditAccount">

src/app/products/saving-products/saving-product-stepper/saving-product-charges-step/saving-product-charges-step.component.html

@@ -28,7 +28,7 @@
     <ng-container matColumnDef="chargeCalculationType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeCalculationType.value | translateCatalog }}
+        {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 
@@ -42,7 +42,7 @@
     <ng-container matColumnDef="chargeTimeType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeTimeType.value | translateCatalog }}
+        {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 

src/app/products/saving-products/saving-product-stepper/saving-product-preview-step/saving-product-preview-step.component.html

@@ -48,22 +48,22 @@
 
   <div fxFlexFill>
     <span fxFlex="40%">{{'labels.inputs.Interest Compounding Period' | translate}}:</span>
-    <span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType | find:savingProductsTemplate.interestCompoundingPeriodTypeOptions:'id':'value' | translateCatalog }}</span>
+    <span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType | find:savingProductsTemplate.interestCompoundingPeriodTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
     <span fxFlex="40%">{{'labels.inputs.Interest Posting Period' | translate}}:</span>
-    <span fxFlex="60%">{{ savingProduct.interestPostingPeriodType | find:savingProductsTemplate.interestPostingPeriodTypeOptions:'id':'value' | translateCatalog }}</span>
+    <span fxFlex="60%">{{ savingProduct.interestPostingPeriodType | find:savingProductsTemplate.interestPostingPeriodTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
     <span fxFlex="40%">{{'labels.inputs.Interest Calculated using' | translate}}:</span>
-    <span fxFlex="60%">{{ savingProduct.interestCalculationType | find:savingProductsTemplate.interestCalculationTypeOptions:'id':'value' | translateCatalog }}</span>
+    <span fxFlex="60%">{{ savingProduct.interestCalculationType | find:savingProductsTemplate.interestCalculationTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
     <span fxFlex="40%">{{'labels.inputs.Days in Year' | translate}}:</span>
-    <span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType | find:savingProductsTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' | translateCatalog }}</span>
+    <span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType | find:savingProductsTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' | translateKey:'catalogs' }}</span>
   </div>
 
   <h3 class="mat-h3" fxFlexFill>{{'labels.inputs.Settings' | translate}}</h3>
@@ -77,7 +77,7 @@
 
   <div fxFlexFill *ngIf="savingProduct.lockinPeriodFrequency">
     <span fxFlex="40%">{{'labels.inputs.Lock-in Period' | translate}}:</span>
-    <span fxFlex="60%">{{ savingProduct.lockinPeriodFrequency + ' ' + (savingProduct.lockinPeriodFrequencyType | find:savingProductsTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') | translateCatalog }}</span>
+    <span fxFlex="60%">{{ savingProduct.lockinPeriodFrequency + ' ' + (savingProduct.lockinPeriodFrequencyType | find:savingProductsTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') | translateKey:'catalogs' }}</span>
   </div>
 
   <div fxFlexFill>
@@ -162,7 +162,7 @@
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeCalculationType.value | translateCatalog }}
+          {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -176,7 +176,7 @@
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeTimeType.value | translateCatalog }}
+          {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 

src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.html

@@ -17,7 +17,7 @@
     <mat-form-field fxFlex="48%">
       <mat-select formControlName="lockinPeriodFrequencyType">
         <mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
-          {{ lockinPeriodFrequencyType.value | translateCatalog }}
+          {{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>

src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.html

@@ -16,7 +16,7 @@
       <mat-label>{{'labels.inputs.Interest Compounding Period' | translate}}</mat-label>
       <mat-select formControlName="interestCompoundingPeriodType" matTooltip="The period at which interest rate is compounded" required>
         <mat-option *ngFor="let interestCompoundingPeriodType of interestCompoundingPeriodTypeData" [value]="interestCompoundingPeriodType.id">
-          {{ interestCompoundingPeriodType.value | translateCatalog }}
+          {{ interestCompoundingPeriodType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -28,7 +28,7 @@
       <mat-label>{{'labels.inputs.Interest Posting Period' | translate}}</mat-label>
       <mat-select formControlName="interestPostingPeriodType" matTooltip="The period at which interest rate is posted or credited to a saving account" required>
         <mat-option *ngFor="let interestPostingPeriodType of interestPostingPeriodTypeData" [value]="interestPostingPeriodType.id">
-          {{ interestPostingPeriodType.value | translateCatalog }}
+          {{ interestPostingPeriodType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -40,7 +40,7 @@
       <mat-label>{{'labels.inputs.Interest Calculated using' | translate}}</mat-label>
       <mat-select formControlName="interestCalculationType" matTooltip="The method used to calculate interest" required>
         <mat-option *ngFor="let interestCalculationType of interestCalculationTypeData" [value]="interestCalculationType.id">
-          {{ interestCalculationType.value | translateCatalog }}
+          {{ interestCalculationType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -52,7 +52,7 @@
       <mat-label>{{'labels.inputs.Days in Year' | translate}}</mat-label>
       <mat-select formControlName="interestCalculationDaysInYearType" matTooltip="The setting for number of days in year to use to calculate interest" required>
         <mat-option *ngFor="let interestCalculationDaysInYearType of interestCalculationDaysInYearTypeData" [value]="interestCalculationDaysInYearType.id">
-          {{ interestCalculationDaysInYearType.value | translateCatalog }}
+          {{ interestCalculationDaysInYearType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>

src/app/products/saving-products/view-saving-product/saving-product-general-tab/saving-product-general-tab.component.html

@@ -57,22 +57,22 @@
 
     <div fxFlexFill>
       <span fxFlex="40%">{{'labels.inputs.Interest Compounding Period' | translate}}:</span>
-      <span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType.value | translateCatalog }}</span>
+      <span fxFlex="60%">{{ savingProduct.interestCompoundingPeriodType.value | translateKey:'catalogs' }}</span>
     </div>
 
     <div fxFlexFill>
       <span fxFlex="40%">{{'labels.inputs.Interest Posting Period' | translate}}:</span>
-      <span fxFlex="60%">{{ savingProduct.interestPostingPeriodType.value | translateCatalog }}</span>
+      <span fxFlex="60%">{{ savingProduct.interestPostingPeriodType.value | translateKey:'catalogs' }}</span>
     </div>
 
     <div fxFlexFill>
       <span fxFlex="40%">{{'labels.inputs.Interest Calculated using' | translate}}:</span>
-      <span fxFlex="60%">{{ savingProduct.interestCalculationType.value | translateCatalog }}</span>
+      <span fxFlex="60%">{{ savingProduct.interestCalculationType.value | translateKey:'catalogs' }}</span>
     </div>
 
     <div fxFlexFill>
       <span fxFlex="40%">{{'labels.inputs.Days in Year' | translate}}:</span>
-      <span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType.value | translateCatalog }}</span>
+      <span fxFlex="60%">{{ savingProduct.interestCalculationDaysInYearType.value | translateKey:'catalogs' }}</span>
     </div>
 
     <h3 class="mat-h3" fxFlexFill>{{'labels.heading.Settings' | translate}}</h3>
@@ -172,7 +172,7 @@
         <ng-container matColumnDef="chargeCalculationType">
           <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
           <td mat-cell *matCellDef="let charge">
-            {{ charge.chargeCalculationType.value | translateCatalog }}
+            {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
           </td>
         </ng-container>
 
@@ -186,7 +186,7 @@
         <ng-container matColumnDef="chargeTimeType">
           <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
           <td mat-cell *matCellDef="let charge">
-            {{ charge.chargeTimeType.value | translateCatalog }}
+            {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
           </td>
         </ng-container>
 

src/app/products/share-products/share-product-stepper/share-product-charges-step/share-product-charges-step.component.html

@@ -28,7 +28,7 @@
     <ng-container matColumnDef="chargeCalculationType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeCalculationType.value | translateCatalog }}
+        {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 
@@ -42,7 +42,7 @@
     <ng-container matColumnDef="chargeTimeType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeTimeType.value | translateCatalog }}
+        {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 

src/app/products/share-products/share-product-stepper/share-product-preview-step/share-product-preview-step.component.html

@@ -132,7 +132,7 @@
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeCalculationType.value | translateCatalog }}
+          {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -146,7 +146,7 @@
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeTimeType.value | translateCatalog }}
+          {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 

src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.html

@@ -33,7 +33,7 @@
       <mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
       <mat-select formControlName="minimumactiveperiodFrequencyType">
         <mat-option *ngFor="let minimumActivePeriodFrequencyType of minimumActivePeriodFrequencyTypeData" [value]="minimumActivePeriodFrequencyType.id">
-          {{ minimumActivePeriodFrequencyType.value | translateCatalog }}
+          {{ minimumActivePeriodFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -49,7 +49,7 @@
       <mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
       <mat-select formControlName="lockinPeriodFrequencyType">
         <mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
-          {{ lockinPeriodFrequencyType.value | translateCatalog }}
+          {{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>

src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.html

@@ -89,12 +89,12 @@
 
         <div fxFlexFill *ngIf="shareProduct.minimumActivePeriod">
           <span fxFlex="40%">{{'labels.inputs.Minimum Active Period' | translate}}:</span>
-          <span fxFlex="60%">{{ shareProduct.minimumActivePeriod }} {{ shareProduct.minimumActivePeriodForDividendsTypeEnum.value | translateCatalog }}</span>
+          <span fxFlex="60%">{{ shareProduct.minimumActivePeriod }} {{ shareProduct.minimumActivePeriodForDividendsTypeEnum.value | translateKey:'catalogs' }}</span>
         </div>
 
         <div fxFlexFill *ngIf="shareProduct.lockinPeriod">
           <span fxFlex="40%">{{'labels.inputs.Lock-in Period' | translate}}:</span>
-          <span fxFlex="60%">{{ shareProduct.lockinPeriod }} {{ shareProduct.lockPeriodTypeEnum.value | translateCatalog}}</span>
+          <span fxFlex="60%">{{ shareProduct.lockinPeriod }} {{ shareProduct.lockPeriodTypeEnum.value | translateKey:'catalogs'}}</span>
         </div>
 
         <div fxFlexFill>
@@ -149,7 +149,7 @@
             <ng-container matColumnDef="chargeCalculationType">
               <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
               <td mat-cell *matCellDef="let charge">
-                {{ charge.chargeCalculationType.value | translateCatalog }}
+                {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
               </td>
             </ng-container>
 
@@ -163,7 +163,7 @@
             <ng-container matColumnDef="chargeTimeType">
               <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
               <td mat-cell *matCellDef="let charge">
-                {{ charge.chargeTimeType.value | translateCatalog }}
+                {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
               </td>
             </ng-container>
 

src/app/savings/savings-account-stepper/savings-account-charges-step/savings-account-charges-step.component.html

@@ -47,7 +47,7 @@
     <ng-container matColumnDef="chargeTimeType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate }} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeTimeType.value | translateCatalog }}
+        {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 

src/app/savings/savings-account-stepper/savings-account-preview-step/savings-account-preview-step.component.html

@@ -137,7 +137,7 @@
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeCalculationType.value | translateCatalog }}
+          {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 

src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.html

@@ -24,7 +24,7 @@
       <mat-label>{{'labels.inputs.Interest Compounding Period' | translate}}</mat-label>
       <mat-select formControlName="interestCompoundingPeriodType" required>
         <mat-option *ngFor="let interestCompoundingPeriodType of interestCompoundingPeriodTypeData" [value]="interestCompoundingPeriodType.id">
-          {{ interestCompoundingPeriodType.value | translateCatalog }}
+          {{ interestCompoundingPeriodType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -36,7 +36,7 @@
       <mat-label>{{'labels.inputs.Interest Posting Period' | translate}}</mat-label>
       <mat-select formControlName="interestPostingPeriodType" required>
         <mat-option *ngFor="let interestPostingPeriodType of interestPostingPeriodTypeData" [value]="interestPostingPeriodType.id">
-          {{ interestPostingPeriodType.value | translateCatalog }}
+          {{ interestPostingPeriodType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -48,7 +48,7 @@
       <mat-label>{{'labels.inputs.Interest Calculated using' | translate}}</mat-label>
       <mat-select formControlName="interestCalculationType" required>
         <mat-option *ngFor="let interestCalculationType of interestCalculationTypeData" [value]="interestCalculationType.id">
-          {{ interestCalculationType.value | translateCatalog }}
+          {{ interestCalculationType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -60,7 +60,7 @@
       <mat-label>{{'labels.inputs.Days in Year' | translate}}</mat-label>
       <mat-select formControlName="interestCalculationDaysInYearType" required>
         <mat-option *ngFor="let interestCalculationDaysInYearType of interestCalculationDaysInYearTypeData" [value]="interestCalculationDaysInYearType.id">
-          {{ interestCalculationDaysInYearType.value | translateCatalog }}
+          {{ interestCalculationDaysInYearType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
       <mat-error>
@@ -88,7 +88,7 @@
       <mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
       <mat-select formControlName="lockinPeriodFrequencyType">
         <mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
-          {{ lockinPeriodFrequencyType.value | translateCatalog }}
+          {{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>

src/app/savings/savings-account-view/charges-tab/charges-tab.component.html

@@ -22,12 +22,12 @@
 
       <ng-container matColumnDef="feeOrPenalty">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Charge Type' | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.penalty ? 'Penalty' : 'Fee' | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.penalty ? 'Penalty' : 'Fee' | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="paymentDueAt">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Payment Due At' | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="dueAsOf">
@@ -42,7 +42,7 @@
 
       <ng-container matColumnDef="calculationType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Calculation Type' | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.chargeCalculationType.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="due">

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

@@ -119,19 +119,19 @@
         </tr>
         <tr>
           <td>{{'labels.inputs.Interest Compounding Period' | translate}}</td>
-          <td>{{savingsAccountData.interestCompoundingPeriodType.value | translateCatalog}}</td>
+          <td>{{savingsAccountData.interestCompoundingPeriodType.value | translateKey:'catalogs'}}</td>
         </tr>
         <tr>
           <td>{{'labels.inputs.Interest Posting Period' | translate}}</td>
-          <td>{{savingsAccountData.interestPostingPeriodType.value | translateCatalog}}</td>
+          <td>{{savingsAccountData.interestPostingPeriodType.value | translateKey:'catalogs'}}</td>
         </tr>
         <tr>
           <td>{{'labels.inputs.Interest Calculated Using' | translate}}</td>
-          <td>{{savingsAccountData.interestCalculationType.value | translateCatalog}}</td>
+          <td>{{savingsAccountData.interestCalculationType.value | translateKey:'catalogs'}}</td>
         </tr>
         <tr>
           <td>{{'labels.inputs.Days in Year' | translate}}</td>
-          <td>{{savingsAccountData.interestCalculationDaysInYearType.value | translateCatalog}}</td>
+          <td>{{savingsAccountData.interestCalculationDaysInYearType.value | translateKey:'catalogs'}}</td>
         </tr>
         <tr *ngIf="savingsAccountData.withdrawalFee">
           <td>{{'labels.inputs.Withdrawal Fee' | translate}}</td>

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

@@ -43,7 +43,7 @@
       <ng-container matColumnDef="transactionType">
         <th mat-header-cell class="center" *matHeaderCellDef> {{"labels.inputs.Transaction Type" | translate}} </th>
         <td mat-cell *matCellDef="let transaction" [ngClass]="savingsTransactionColor(transaction)" (click)="showTransactions(transaction)">
-          {{ transaction.transactionType.value | translateCatalog }}
+          {{ transaction.transactionType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 

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

@@ -51,7 +51,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.penalty ? 'Penalty' : 'Fee' | translateCatalog }}
+          {{ chargeData.penalty ? 'Penalty' : 'Fee' | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
@@ -67,7 +67,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.chargeTimeType.value | translateCatalog }}
+          {{ chargeData.chargeTimeType.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">
@@ -83,7 +83,7 @@
         </div>
 
         <div fxFlex="50%">
-          {{ chargeData.chargeCalculationType.value | translateCatalog }}
+          {{ chargeData.chargeCalculationType.value | translateKey:'catalogs' }}
         </div>
 
         <div fxFlex="50%" class="mat-body-strong">

src/app/shared/dropdown/dropdown.component.html

@@ -2,7 +2,7 @@
     <mat-label>{{getLabelText()}}</mat-label>
     <mat-select placeholder="{{getPlaceHolderText()}}" formControlName="controlSelect">
         <mat-option *ngFor="let option of selectOptions" [value]="option.id">
-            {{ option.value | translateCatalog }}
+            {{ option.value | translateKey:'catalogs' }}
         </mat-option>
     </mat-select>
     <button mat-button *ngIf="controlSelect" matSuffix mat-icon-button

src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.html

@@ -28,7 +28,7 @@
     <ng-container matColumnDef="chargeCalculationType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeCalculationType.value | translateCatalog }}
+        {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 
@@ -45,7 +45,7 @@
     <ng-container matColumnDef="chargeTimeType">
       <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
       <td mat-cell *matCellDef="let charge">
-        {{ charge.chargeTimeType.value | translateCatalog }}
+        {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
       </td>
     </ng-container>
 

src/app/shares/shares-account-stepper/shares-account-preview-step/shares-account-preview-step.component.html

@@ -55,12 +55,12 @@
 
   <div fxFlexFill *ngIf="sharesAccount.minimumActivePeriod">
     <span fxFlex="40%">{{'labels.inputs.Minimum Active Period' | translate}}</span>
-    <span fxFlex="60%">{{sharesAccount.minimumActivePeriod}}&nbsp;{{sharesAccount.minimumActivePeriodFrequencyType | find:sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions:'id':'value' | translateCatalog}}</span>
+    <span fxFlex="60%">{{sharesAccount.minimumActivePeriod}}&nbsp;{{sharesAccount.minimumActivePeriodFrequencyType | find:sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions:'id':'value' | translateKey:'catalogs'}}</span>
   </div>
 
   <div fxFlexFill *ngIf="sharesAccount.lockinPeriodFrequency">
     <span fxFlex="40%">{{'labels.inputs.Lock-in Period' | translate}}</span>
-    <span fxFlex="60%">{{sharesAccount.lockinPeriodFrequency}}&nbsp;{{sharesAccount.lockinPeriodFrequencyType | find:sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value' | translateCatalog}}</span>
+    <span fxFlex="60%">{{sharesAccount.lockinPeriodFrequency}}&nbsp;{{sharesAccount.lockinPeriodFrequencyType | find:sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value' | translateKey:'catalogs'}}</span>
   </div>
 
   <div fxFlexFill>
@@ -91,7 +91,7 @@
       <ng-container matColumnDef="chargeCalculationType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Type' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeCalculationType.value | translateCatalog }}
+          {{ charge.chargeCalculationType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 
@@ -105,7 +105,7 @@
       <ng-container matColumnDef="chargeTimeType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Collected On' | translate}} </th>
         <td mat-cell *matCellDef="let charge">
-          {{ charge.chargeTimeType.value | translateCatalog }}
+          {{ charge.chargeTimeType.value | translateKey:'catalogs' }}
         </td>
       </ng-container>
 

src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.html

@@ -59,7 +59,7 @@
       <mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
       <mat-select formControlName="minimumActivePeriodFrequencyType">
         <mat-option *ngFor="let minimumActivePeriodFrequencyType of minimumActivePeriodFrequencyTypeData" [value]="minimumActivePeriodFrequencyType.id">
-          {{ minimumActivePeriodFrequencyType.value | translateCatalog }}
+          {{ minimumActivePeriodFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>
@@ -75,7 +75,7 @@
       <mat-label>{{'labels.inputs.Type' | translate}}</mat-label>
       <mat-select formControlName="lockinPeriodFrequencyType">
         <mat-option *ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData" [value]="lockinPeriodFrequencyType.id">
-          {{ lockinPeriodFrequencyType.value | translateCatalog }}
+          {{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }}
         </mat-option>
       </mat-select>
     </mat-form-field>

src/app/shares/shares-account-view/charges-tab/charges-tab.component.html

@@ -20,12 +20,12 @@
 
       <ng-container matColumnDef="paymentDueAt">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Payment Due At' | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateCatalog }} </td>
+        <td mat-cell *matCellDef="let charge"> {{ charge.chargeTimeType.value | translateKey:'catalogs' }} </td>
       </ng-container>
 
       <ng-container matColumnDef="calculationType">
         <th mat-header-cell *matHeaderCellDef> {{'labels.inputs.Calculation Type' | translate}} </th>
-        <td mat-cell *matCellDef="let charge"> {{charge.chargeCalculationType.value | translateCatalog}} </td>
+        <td mat-cell *matCellDef="let charge"> {{charge.chargeCalculationType.value | translateKey:'catalogs'}} </td>
       </ng-container>
 
       <ng-container matColumnDef="due">

src/app/shares/shares-account-view/shares-account-view.component.html

@@ -42,7 +42,7 @@
                     <tr *ngIf="sharesAccountData.lockinPeriod">
                       <td>{{"labels.inputs.Lockin Period" | translate}} :</td>
                       <td>
-                        {{sharesAccountData.lockinPeriod}} {{sharesAccountData.lockPeriodTypeEnum.value | translateCatalog}}
+                        {{sharesAccountData.lockinPeriod}} {{sharesAccountData.lockPeriodTypeEnum.value | translateKey:'catalogs'}}
                       </td>
                     </tr>
                   </tbody>

src/assets/translations/cs-CS.json

@@ -573,6 +573,7 @@
       "Annually": "Každoročně",
       "Weekly": "Týdně",
       "Daily Balance": "Denní zůstatek",
+      "% Disbursement Amount": "Částka vyplacení",
       "Average Daily Balance": "Průměrný denní zůstatek",
       "BiAnnual": "Pololetní",
       "360 Days": "360 dní",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Tato možnost umožňuje vytvářet nové poplatky. Podporuje poplatky za úvěr, poplatky za spoření a vklady a poplatky za klienty.",
       "System": "Systém",
       "Table": "Stůl",
+      "Tax Components": "Složky daně",
       "Tellers": "Věštci",
       "Template I am trying to use": "Toto je šablona, ​​kterou se snažím použít. Je to v pořádku?",
       "Templates": "Šablony",

src/assets/translations/de-DE.json

@@ -573,6 +573,7 @@
       "Annually": "Jährlich",
       "Weekly": "Wöchentlich",
       "Daily Balance": "Tagesbilanz",
+      "% Disbursement Amount": "Auszahlungsbetrag",
       "Average Daily Balance": "Durchschnittlicher Tagessaldo",
       "BiAnnual": "Zweijährlich",
       "360 Days": "360 Tage",
@@ -2933,6 +2934,7 @@
       "Supports Loan charges, Savings & deposits": "Mit dieser Option können Sie neue Gebühren erstellen. Es unterstützt Kreditgebühren, Spar- und Einlagengebühren sowie Kundengebühren.",
       "System": "System",
       "Table": "Tisch",
+      "Tax Components": "Steuerkomponenten",
       "Tellers": "Kassierer",
       "Template I am trying to use": "Dies ist die Vorlage, die ich verwenden möchte. Ist das gut.",
       "Templates": "Vorlagen",

src/assets/translations/en-US.json

@@ -573,6 +573,7 @@
             "Semi-Annual": "Semi-Annual",
             "Annually": "Annually",
             "Daily Balance": "Daily Balance",
+            "% Disbursement Amount": "% Disbursement Amount",
             "Average Daily Balance": "Average Daily Balance",
             "BiAnnual": "BiAnnual",
             "360 Days": "360 Days",
@@ -2936,6 +2937,7 @@
             "Supports Loan charges, Savings & deposits": "This option allows you to create new charges. It supports Loan charges, Savings and deposits charges and Client charges.",
             "System": "System",
             "Table": "Table",
+            "Tax Components": "Tax Components",
             "Tellers": "Tellers",
             "Template I am trying to use": "This is the template I am trying to use. Is that fine.",
             "Templates": "Templates",

src/assets/translations/es-MX.json

@@ -573,6 +573,7 @@
             "Annually": "Anual",
             "Weekly": "Semanal",
             "Daily Balance": "Saldo Diario",
+            "% Disbursement Amount": "Monto de desembolso",
             "Average Daily Balance": "Saldo Diario Promedio",
             "BiAnnual": "Semestral",
             "360 Days": "360 Días",
@@ -2933,6 +2934,7 @@
             "Supports Loan charges, Savings & deposits": "Esta opción le permite crear nuevos cargos. Admite cargos por Créditos, cargos por ahorros y depósitos y cargos por clientes.",
             "System": "Sistema",
             "Table": "Tabla",
+            "Tax Components": "Componentes tributarios",
             "Tellers": "Cajeros",
             "Template I am trying to use": "Esta es la plantilla que estoy intentando utilizar. Eso está bien.",
             "Templates": "Plantillas",

src/assets/translations/fr-FR.json

@@ -573,6 +573,7 @@
       "Semi-Annual": "Semestriel",
       "Annually": "Annuellement",
       "Daily Balance": "Solde quotidien",
+      "% Disbursement Amount": "Montant du décaissement",
       "Average Daily Balance": "Solde quotidien moyen",
       "BiAnnual": "Semestriel",
       "360 Days": "360 jours",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Cette option vous permet de créer de nouveaux frais. Il prend en charge les frais de prêt, les frais d'épargne et de dépôt et les frais du client.",
       "System": "Système",
       "Table": "Tableau",
+      "Tax Components": "Composantes fiscales",
       "Tellers": "Caissiers",
       "Template I am trying to use": "C'est le modèle que j'essaie d'utiliser. Es-ce bien.",
       "Templates": "Modèles",

src/assets/translations/it-IT.json

@@ -573,6 +573,7 @@
       "Annually": "Annualmente",
       "Weekly": "settimanalmente",
       "Daily Balance": "Saldo giornaliero",
+      "% Disbursement Amount": "Importo dell'esborso",
       "Average Daily Balance": "Saldo medio giornaliero",
       "BiAnnual": "Semestrale",
       "360 Days": "360 giorni",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Questa opzione ti consente di creare nuovi addebiti. Supporta le spese di prestito, le spese di risparmio e deposito e le spese del cliente.",
       "System": "Sistema",
       "Table": "Tavolo",
+      "Tax Components": "Componenti fiscali",
       "Tellers": "Scrutatori",
       "Template I am trying to use": "Questo è il modello che sto cercando di utilizzare. Va bene?",
       "Templates": "Modelli",

src/assets/translations/ko-KO.json

@@ -573,6 +573,7 @@
       "Annually": "매년",
       "Weekly": "주간",
       "Daily Balance": "일일 잔액",
+      "% Disbursement Amount": "지급금액",
       "Average Daily Balance": "평균 일일 잔액",
       "BiAnnual": "격년",
       "360 Days": "360일",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "이 옵션을 사용하면 새 요금을 생성할 수 있습니다. 대출 수수료, 예금 수수료, 고객 수수료를 지원합니다.",
       "System": "체계",
       "Table": "테이블",
+      "Tax Components": "세금 구성요소",
       "Tellers": "텔러",
       "Template I am trying to use": "제가 사용하려고 하는 템플릿입니다. 괜찮나요?",
       "Templates": "템플릿",

src/assets/translations/lt-LT.json

@@ -573,6 +573,7 @@
       "Annually": "Kasmet",
       "Weekly": "Kas savaitę",
       "Daily Balance": "Dienos balansas",
+      "% Disbursement Amount": "Išmokos suma",
       "Average Daily Balance": "Vidutinis dienos balansas",
       "BiAnnual": "Kas dvejus metus",
       "360 Days": "360 dienų",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Ši parinktis leidžia sukurti naujus mokesčius. Tai palaiko paskolos mokesčius, taupymo ir indėlių mokesčius ir klientų mokesčius.",
       "System": "Sistema",
       "Table": "Lentelė",
+      "Tax Components": "Mokesčių komponentai",
       "Tellers": "Pasakotojai",
       "Template I am trying to use": "Tai yra šablonas, kurį bandau naudoti. Ar tai gerai.",
       "Templates": "Šablonai",

src/assets/translations/lv-LV.json

@@ -573,6 +573,7 @@
       "Annually": "Ik gadu",
       "Weekly": "Iknedēļas",
       "Daily Balance": "Dienas bilance",
+      "% Disbursement Amount": "Izmaksas summa",
       "Average Daily Balance": "Vidējais dienas atlikums",
       "BiAnnual": "Divreiz gadā",
       "360 Days": "360 dienas",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Šī opcija ļauj izveidot jaunas maksas. Tā atbalsta aizdevuma maksas, uzkrājumu un noguldījumu maksas un klientu maksas.",
       "System": "Sistēma",
       "Table": "Tabula",
+      "Tax Components": "Nodokļu sastāvdaļas",
       "Tellers": "Teicēji",
       "Template I am trying to use": "Šī ir veidne, ko cenšos izmantot. Vai tas ir labi.",
       "Templates": "Veidnes",

src/assets/translations/ne-NE.json

@@ -573,6 +573,7 @@
       "Annually": "वार्षिक रूपमा",
       "Weekly": "साप्ताहिक",
       "Daily Balance": "दैनिक ब्यालेन्स",
+      "% Disbursement Amount": "वितरण रकम",
       "Average Daily Balance": "औसत दैनिक ब्यालेन्स",
       "BiAnnual": "द्विवार्षिक",
       "360 Days": "३६० दिन",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "यो विकल्पले तपाईंलाई नयाँ शुल्कहरू सिर्जना गर्न अनुमति दिन्छ। यसले ऋण शुल्क, बचत र निक्षेप शुल्क र ग्राहक शुल्कहरू समर्थन गर्दछ।",
       "System": "प्रणाली",
       "Table": "तालिका",
+      "Tax Components": "कर अवयवहरू",
       "Tellers": "टेलरहरू",
       "Template I am trying to use": "यो टेम्प्लेट हो जुन म प्रयोग गर्न खोज्दै छु। त्यो ठीक छ?",
       "Templates": "टेम्प्लेटहरू",

src/assets/translations/pt-PT.json

@@ -573,6 +573,7 @@
       "Annually": "Anualmente",
       "Weekly": "Semanalmente",
       "Daily Balance": "Saldo Diário",
+      "% Disbursement Amount": "Valor do Desembolso",
       "Average Daily Balance": "Saldo Médio Diário",
       "BiAnnual": "Semestral",
       "360 Days": "360 dias",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Esta opção permite criar novas cobranças. Suporta encargos de empréstimos, encargos de poupança e depósitos e encargos de clientes.",
       "System": "Sistema",
       "Table": "Mesa",
+      "Tax Components": "Componentes fiscais",
       "Tellers": "Caixas",
       "Template I am trying to use": "Este é o modelo que estou tentando usar. Tudo bem.",
       "Templates": "Modelos",

src/assets/translations/sw-SW.json

@@ -573,6 +573,7 @@
       "Annually": "Kila mwaka",
       "Weekly": "Kila wiki",
       "Daily Balance": "Mizani ya Kila siku",
+      "% Disbursement Amount": "Kiasi cha Malipo",
       "Average Daily Balance": "Wastani wa Salio la Kila Siku",
       "BiAnnual": "BiAnnual",
       "360 Days": "Siku 360",
@@ -2934,6 +2935,7 @@
       "Supports Loan charges, Savings & deposits": "Chaguo hili hukuruhusu kuunda gharama mpya. Inaauni ada za Mikopo, Ada za Akiba na amana na ada za Mteja.",
       "System": "Mfumo",
       "Table": "Meza",
+      "Tax Components": "Vipengele vya Ushuru",
       "Tellers": "Watangazaji",
       "Template I am trying to use": "Hiki ndicho kiolezo ninachojaribu kutumia. Je, ni sawa.",
       "Templates": "Violezo",