diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html index 492ce5e45..888722d54 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.html @@ -97,21 +97,21 @@ *ngIf="paymentChannelToFundSourceMappings.value.length !== 0"> - Payment Type + {{'labels.heading.Payment Type' | translate}} {{ paymentFundSource.paymentTypeId | find:paymentTypeData:'id':'name' }} - Fund Source + {{'labels.inputs.Fund Source' | translate}} {{ paymentFundSource.fundSourceAccountId | find:assetAccountData:'id':'name' }} - Actions + {{'labels.buttons.Actions' | translate}} - \ No newline at end of file + diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts index 6bb8938b7..85724594b 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts @@ -1,13 +1,14 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray, Validators, UntypedFormControl } from '@angular/forms'; +import { Component, Input, OnInit } from '@angular/core'; +import { UntypedFormArray, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; -import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; +import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; +import { TranslateService } from '@ngx-translate/core'; +import { Accounting } from 'app/core/utils/accounting'; import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base'; import { SelectBase } from 'app/shared/form-dialog/formfield/model/select-base'; -import { Accounting } from 'app/core/utils/accounting'; @Component({ selector: 'mifosx-fixed-deposit-product-accounting-step', @@ -35,7 +36,8 @@ export class FixedDepositProductAccountingStepComponent implements OnInit { constructor(private formBuilder: UntypedFormBuilder, public dialog: MatDialog, - private accounting: Accounting) { + private accounting: Accounting, + private translateService: TranslateService) { this.createfixedDepositProductAccountingForm(); this.setConditionalControls(); } @@ -206,7 +208,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit { delete(formArray: UntypedFormArray, index: number) { const dialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: `this` } + data: { deleteContext: this.translateService.instant('labels.text.this') } }); dialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.ts index 9c8a70861..e27a36fc1 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.ts +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.ts @@ -1,7 +1,8 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; +import { Component, Input, OnInit } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; +import { TranslateService } from '@ngx-translate/core'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; @Component({ @@ -19,7 +20,8 @@ export class FixedDepositProductChargesStepComponent implements OnInit { chargesDataSource: {}[]; displayedColumns: string[] = ['name', 'chargeCalculationType', 'amount', 'chargeTimeType', 'action']; - constructor(public dialog: MatDialog) { + constructor(public dialog: MatDialog, + private translateService: TranslateService) { } ngOnInit() { @@ -39,7 +41,7 @@ export class FixedDepositProductChargesStepComponent implements OnInit { deleteCharge(charge: any) { const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: `charge ${charge.name}` } + data: { deleteContext: this.translateService.instant('labels.inputs.Charge') + ' ' + charge.name } }); deleteChargeDialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html index 23cefbe2d..928d8ed6b 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html @@ -39,7 +39,7 @@ - Valid from Date {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} + {{'labels.inputs.Valid from Date' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts index 775b54663..1fb334d88 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts @@ -1,24 +1,23 @@ /** Angular Imports */ -import { Component, OnInit, Input } from '@angular/core'; -import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormArray } from '@angular/forms'; -import { MatDialog } from '@angular/material/dialog'; import { animate, state, style, transition, trigger } from '@angular/animations'; -import { TooltipPosition } from '@angular/material/tooltip'; +import { Component, Input, OnInit } from '@angular/core'; +import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { MatDialog } from '@angular/material/dialog'; /** Custom Components */ -import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; import { DepositProductIncentiveFormDialogComponent } from 'app/products/deposit-product-incentive-form-dialog/deposit-product-incentive-form-dialog.component'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; +import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; /** Dialog Components */ import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base'; -import { SelectBase } from 'app/shared/form-dialog/formfield/model/select-base'; import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base'; +import { SelectBase } from 'app/shared/form-dialog/formfield/model/select-base'; /** Custom Services */ -import { SettingsService } from 'app/settings/settings.service'; -import { Dates } from 'app/core/utils/dates'; import { TranslateService } from '@ngx-translate/core'; +import { Dates } from 'app/core/utils/dates'; +import { SettingsService } from 'app/settings/settings.service'; @Component({ selector: 'mifosx-fixed-deposit-product-interest-rate-chart-step', @@ -284,7 +283,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit } editChartSlab(chartSlabs: UntypedFormArray, chartSlabIndex: number) { - const data = { ...this.getData('Slab', chartSlabs.at(chartSlabIndex).value), layout: { addButtonText: 'Edit' } }; + const data = { ...this.getData('Slab', chartSlabs.at(chartSlabIndex).value), layout: { addButtonText: this.translateService.instant('labels.text.this') } }; const dialogRef = this.dialog.open(FormDialogComponent, { data }); dialogRef.afterClosed().subscribe((response: any) => { if (response.data) { @@ -294,7 +293,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit } editIncentive(incentives: UntypedFormArray, incentiveIndex: number) { - const data = { ...this.getData('Incentive', incentives.at(incentiveIndex).value), layout: { addButtonText: 'Edit' } }; + const data = { ...this.getData('Incentive', incentives.at(incentiveIndex).value), layout: { addButtonText: this.translateService.instant('labels.text.this') } }; const dialogRef = this.dialog.open(DepositProductIncentiveFormDialogComponent, { data }); dialogRef.afterClosed().subscribe((response: any) => { if (response.data) { @@ -305,7 +304,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit delete(formArray: UntypedFormArray, index: number) { const dialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: `this` } + data: { deleteContext: this.translateService.instant('labels.text.this') } }); dialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html index ccfd0064f..419aaf87b 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html @@ -42,8 +42,8 @@ -

Create fixed deposit product

-

This option allows you to create new fixed deposit product.

+

{{'labels.buttons.Create Fixed Deposit Product' | translate}}

+

{{'labels.text.Allows you to create new fixed deposit product' | translate}}

@@ -52,7 +52,7 @@ -

Search bar to filter fixed deposit products.

+

{{'labels.text.Search bar to filter fixed deposit products.' | translate}}

@@ -61,7 +61,7 @@ -

List of fixed deposit products in the organization. For more details click: {{'labels.inputs.Fixed Deposit Products' | translate}}

+

{{'labels.text.List of fixed deposit products in the organization' | translate}}: {{'labels.inputs.Fixed Deposit Products' | translate}}

diff --git a/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html b/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html index c3c21a0b8..959f4def0 100644 --- a/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html +++ b/src/app/products/floating-rates/create-floating-rate/create-floating-rate.component.html @@ -9,20 +9,19 @@
- Floating Rate Name + {{'labels.inputs.Floating Rate Name' | translate}} - Floating Rate Name is required + {{'labels.inputs.Floating Rate Name' | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}}
- Is Base Lending - Rate? + {{'labels.inputs.Is Base Lending Rate' | translate}}?
- Active + {{'labels.inputs.Active' | translate}}
@@ -35,7 +34,7 @@
-

Floating Rate Periods

+

{{'labels.inputs.Floating Rate Periods' | translate}}