diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/view-transaction/view-transaction.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/view-transaction/view-transaction.component.html index 957420b541..5fac0d3f07 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/view-transaction/view-transaction.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/view-transaction/view-transaction.component.html @@ -71,7 +71,7 @@
- +
diff --git a/src/app/keyboards-shortcut-config.ts b/src/app/keyboards-shortcut-config.ts index a7ec6ce5cf..b57b9e1b94 100644 --- a/src/app/keyboards-shortcut-config.ts +++ b/src/app/keyboards-shortcut-config.ts @@ -57,9 +57,9 @@ export class KeyboardShortcutsConfiguration { // Create Client - ctrl + c { title: 'Create Client', - ctrlKey: true, + ctrlKey: false, shiftKey: false, - altKey: false, + altKey: true, key: 'c', route: 'clients/create' }, @@ -120,18 +120,18 @@ export class KeyboardShortcutsConfiguration { // Accounting - ctrl + a { title: 'Accounting', - ctrlKey: true, + ctrlKey: false, shiftKey: false, - altKey: false, + altKey: true, key: 'a', route: 'accounting' }, // Save/Submit Forms - ctrl + s { title: 'Save/Submit Forms', - ctrlKey: true, + ctrlKey: false, shiftKey: false, - altKey: false, + altKey: true, key: 's', route: '', id: 'submit' @@ -139,9 +139,9 @@ export class KeyboardShortcutsConfiguration { // Cancel - ctrl + x { title: 'Cancel', - ctrlKey: true, + ctrlKey: false, shiftKey: false, - altKey: false, + altKey: true, key: 'x', route: '', id: 'cancel' @@ -149,9 +149,9 @@ export class KeyboardShortcutsConfiguration { // Help - ctrl + h { title: 'Help', - ctrlKey: true, + ctrlKey: false, shiftKey: false, - altKey: false, + altKey: true, key: 'h', route: '', id: 'help' diff --git a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.html b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.html index b713ad5c6a..0f9a3a1fb5 100644 --- a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.html +++ b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.html @@ -11,7 +11,7 @@

{{"labels.heading.Active Asset Transfer" | translate}}

- {{activeTransferData.status}} + {{activeTransferData.status}}
diff --git a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss index 339354702d..97c3585c76 100644 --- a/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss +++ b/src/app/loans/loans-view/external-asset-owner-tab/external-asset-owner-tab.component.scss @@ -33,7 +33,7 @@ margin: 1%; } -.status { +.external-asset-owner-status { color: black; } diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html index 99047d3770..6e3007d19f 100644 --- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html +++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html @@ -124,7 +124,7 @@
- +
diff --git a/src/app/organization/manage-funds/view-fund/view-fund.component.html b/src/app/organization/manage-funds/view-fund/view-fund.component.html index 1c80bc57b4..5d4d56a91c 100644 --- a/src/app/organization/manage-funds/view-fund/view-fund.component.html +++ b/src/app/organization/manage-funds/view-fund/view-fund.component.html @@ -32,7 +32,7 @@
- +
diff --git a/src/app/pipes/yesno.pipe.ts b/src/app/pipes/yesno.pipe.ts index 5450535b7b..8980d2a927 100644 --- a/src/app/pipes/yesno.pipe.ts +++ b/src/app/pipes/yesno.pipe.ts @@ -1,15 +1,19 @@ import { Pipe, PipeTransform } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; @Pipe({ name: 'yesNo' }) export class YesnoPipe implements PipeTransform { + constructor(private translateService: TranslateService) { } + transform(value: boolean, ...args: unknown[]): string { if (value == null) { return null; } - return value ? 'Yes' : 'No'; + const result = value ? 'Yes' : 'No'; + return this.translateService.instant('labels.buttons.' + result); } } diff --git a/src/app/products/charges/view-charge/view-charge.component.html b/src/app/products/charges/view-charge/view-charge.component.html index 5566b3bc31..3dc6fcbb08 100644 --- a/src/app/products/charges/view-charge/view-charge.component.html +++ b/src/app/products/charges/view-charge/view-charge.component.html @@ -141,7 +141,7 @@
- +
diff --git a/src/app/reports/run-report/table-and-sms/table-and-sms.component.html b/src/app/reports/run-report/table-and-sms/table-and-sms.component.html index d1de4f2206..4ebd02868d 100644 --- a/src/app/reports/run-report/table-and-sms/table-and-sms.component.html +++ b/src/app/reports/run-report/table-and-sms/table-and-sms.component.html @@ -41,7 +41,7 @@
- {{'labels.text.The report request has been sent and the report will be exported to file repository' | translate}} + {{'labels.text.The report request' | translate}}
diff --git a/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html b/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html index 698dae5ba1..b315a6e008 100644 --- a/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html +++ b/src/app/savings/savings-account-view/transactions/view-transaction/savings-transaction-general-tab/savings-transaction-general-tab.component.html @@ -87,7 +87,7 @@
-
diff --git a/src/app/savings/savings-account-view/view-charge/view-charge.component.html b/src/app/savings/savings-account-view/view-charge/view-charge.component.html index 5eb0ccc197..c42b23f3db 100644 --- a/src/app/savings/savings-account-view/view-charge/view-charge.component.html +++ b/src/app/savings/savings-account-view/view-charge/view-charge.component.html @@ -121,7 +121,7 @@
- +
diff --git a/src/app/users/view-user/view-user.component.html b/src/app/users/view-user/view-user.component.html index 4c0938f2b2..7fc06c43ef 100644 --- a/src/app/users/view-user/view-user.component.html +++ b/src/app/users/view-user/view-user.component.html @@ -75,7 +75,7 @@
- +
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index f1bf9fa09b..5ce3160647 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Výdajový účet (DR)", "Expenses from Goodwill Credit": "Výdaje z Goodwill Credit", "Expiry Date": "Datum vypršení platnosti", + "Export to FIle": "Export do FILE", "Extend Repayment Period": "Prodloužit dobu splácení", "External Asset Owner": "Externí vlastník aktiv", "External ID": "Externí ID", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 0f28a1bf4a..a287395051 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Spesenkonto (DR)", "Expenses from Goodwill Credit": "Aufwendungen aus Goodwill-Guthaben", "Expiry Date": "Verfallsdatum", + "Export to FIle": "In eine Datei exportieren", "Extend Repayment Period": "Verlängern Sie die Rückzahlungsfrist", "External Asset Owner": "Externer Asset-Eigentümer", "External ID": "Externe ID", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index 858eb668de..3a665f2e81 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -1293,6 +1293,7 @@ "Expense Account (DR)": "Expense Account (DR)", "Expenses from Goodwill Credit": "Expenses from Goodwill Credit", "Expiry Date": "Expiry Date", + "Export to FIle": "Export to FIle", "Extend Repayment Period": "Extend Repayment Period", "External Asset Owner": "External Asset Owner", "External ID": "External ID", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index a1768b4c70..8ee91fd1a8 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -961,12 +961,12 @@ "Alt": "Alt.", "Amortization": "Amortización", "Amortization Type": "Tipo de amortización", - "Amount": "Cantidad", + "Amount": "Monto", "Amount Collected": "Monto recaudado", - "Amount Paid": "Cantidad pagada", + "Amount Paid": "Monto pagado", "Amount Pending / Disbursed": "Monto Pendiente / Desembolsado", - "Amount Range": "Rango de cantidad", - "Amount Recieved/Returned": "Cantidad recibida/devuelta", + "Amount Range": "Rango de Monto", + "Amount Recieved/Returned": "Monto recibida/devuelta", "Amount to be Reserved": "Monto a reservar", "Annual Fees Transaction Date": "Fecha de transacción de comisiones anuales", "Applies To": "Se aplica a", @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Cuenta de gastos (DR)", "Expenses from Goodwill Credit": "Gastos del crédito de buena voluntad", "Expiry Date": "Fecha de Caducidad", + "Export to FIle": "Exportar Archivo", "Extend Repayment Period": "Ampliar el período de pago", "External Asset Owner": "Propietario de activos externos", "External ID": "Id externo", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index 1449d8d627..3249040e6b 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Compte de dépenses (DR)", "Expenses from Goodwill Credit": "Dépenses liées au crédit de bonne volonté", "Expiry Date": "Date d'expiration", + "Export to FIle": "Exporter vers un fichier", "Extend Repayment Period": "Prolonger la période de remboursement", "External Asset Owner": "Propriétaire de l'actif externe", "External ID": "ID externe", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index 711a761a38..4af76af4e1 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Conto spese (DR)", "Expenses from Goodwill Credit": "Spese derivanti dal credito di avviamento", "Expiry Date": "Data di scadenza", + "Export to FIle": "Esporta su file", "Extend Repayment Period": "Estendere il periodo di rimborso", "External Asset Owner": "Proprietario della risorsa esterna", "External ID": "ID esterno", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index a9d0bdd540..9992912c4c 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -1295,6 +1295,7 @@ "Expense Account (DR)": "비용 계정(DR)", "Expenses from Goodwill Credit": "영업권 신용으로 인한 비용", "Expiry Date": "만료일", + "Export to FIle": "파일로 내보내기", "Extend Repayment Period": "상환기간 연장", "External Asset Owner": "외부 자산 소유자", "External ID": "외부 ID", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index 1a77ab5aa9..1121daecec 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Išlaidų sąskaita (DR)", "Expenses from Goodwill Credit": "Išlaidos iš prestižo kredito", "Expiry Date": "Galiojimo pabaigos data", + "Export to FIle": "Eksportuoti į failą", "Extend Repayment Period": "Prailginti grąžinimo laikotarpį", "External Asset Owner": "Išorinis turto savininkas", "External ID": "Išorinis ID", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index f9b4b6e636..56af824d1a 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Izdevumu konts (DR)", "Expenses from Goodwill Credit": "Izdevumi no nemateriālās vērtības kredīta", "Expiry Date": "Derīguma termiņš", + "Export to FIle": "Eksportēt uz failu", "Extend Repayment Period": "Pagarināt atmaksas periodu", "External Asset Owner": "Ārējais īpašuma īpašnieks", "External ID": "Ārējais ID", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index 89e6f73ac3..c53192aff3 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "व्यय खाता (DR)", "Expenses from Goodwill Credit": "गुडविल क्रेडिटबाट खर्च", "Expiry Date": "म्याद सकिने मिति", + "Export to FIle": "फाइलमा निर्यात गर्नुहोस्", "Extend Repayment Period": "पुन: भुक्तानी अवधि विस्तार गर्नुहोस्", "External Asset Owner": "बाह्य सम्पत्ति मालिक", "External ID": "बाह्य आईडी", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index d89c475a8d..a69f1fdcb3 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Conta de Despesas (DR)", "Expenses from Goodwill Credit": "Despesas de Crédito Goodwill", "Expiry Date": "Data de validade", + "Export to FIle": "Exportar arquivo", "Extend Repayment Period": "Estender o período de reembolso", "External Asset Owner": "Proprietário de ativo externo", "External ID": "ID externo", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index 42656c4c5b..b43d3bdd30 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -1294,6 +1294,7 @@ "Expense Account (DR)": "Akaunti ya Gharama (DR)", "Expenses from Goodwill Credit": "Gharama kutoka kwa Mikopo ya Nia Njema", "Expiry Date": "Tarehe ya mwisho wa matumizi", + "Export to FIle": "Hamisha kwa FILE", "Extend Repayment Period": "Kuongeza Muda wa Kulipa", "External Asset Owner": "Mmiliki wa Mali ya Nje", "External ID": "Kitambulisho cha Nje", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d352f896be..2bef3aeb21 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -15,7 +15,7 @@ export const environment = { fineractPlatformTenantIds: window['env']['fineractPlatformTenantIds'] || 'default', // For connecting to others servers running elsewhere update the base API URL baseApiUrls: window['env']['fineractApiUrls'] || - 'https://dev.mifos.io,https://demo.mifos.io,https://qa.mifos.io,https://staging.mifos.io,https://mobile.mifos.io,https://demo.fineract.dev,https://localhost:8443', + 'https://dev.mifos.io,https://demo.mifos.io,https://qa.mifos.io,https://staging.mifos.io,https://mobile.mifos.io,https://demo.fineract.dev,https://localhost:8443,http://localhost:8443', // For connecting to server running elsewhere set the base API URL baseApiUrl: window['env']['baseApiUrl'] || 'https://demo.fineract.dev', allowServerSwitch: env.allow_switching_backend_instance, diff --git a/src/theme/_dark_content.scss b/src/theme/_dark_content.scss index ecd03883cb..da397beace 100644 --- a/src/theme/_dark_content.scss +++ b/src/theme/_dark_content.scss @@ -238,4 +238,8 @@ body.dark-theme { } } + .external-asset-owner-status { + color: white; + } + }