diff --git a/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts b/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts index 8505ef991..479781acc 100644 --- a/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts +++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts @@ -43,11 +43,7 @@ export class EmergencyFundCoverage extends Rule { baseCurrency: ruleSettings.baseCurrency, emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString( ruleSettings.locale - ), - emergencyFundHoldingsValue: - this.emergencyFundHoldingsValueInBaseCurrency.toLocaleString( - ruleSettings.locale - ) + ) } }), value: false @@ -65,9 +61,6 @@ export class EmergencyFundCoverage extends Rule { languageCode: this.getLanguageCode(), placeholders: { baseCurrency: ruleSettings.baseCurrency, - coverage: coverageInBaseCurrency.toLocaleString( - ruleSettings.locale - ), emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString( ruleSettings.locale ) diff --git a/apps/api/src/services/i18n/i18n.service.ts b/apps/api/src/services/i18n/i18n.service.ts index 65c51b2f0..83eb3a3ac 100644 --- a/apps/api/src/services/i18n/i18n.service.ts +++ b/apps/api/src/services/i18n/i18n.service.ts @@ -45,7 +45,10 @@ export class I18nService implements OnModuleInit { if (placeholders) { for (const [key, value] of Object.entries(placeholders)) { - translatedText = translatedText.replace(`\${${key}}`, String(value)); + translatedText = translatedText.replace( + new RegExp(`\\$\\{${key}\\}`, 'g'), + String(value) + ); } } diff --git a/apps/client/src/app/pages/i18n/i18n-page.html b/apps/client/src/app/pages/i18n/i18n-page.html index 15c58fbf2..8636a6976 100644 --- a/apps/client/src/app/pages/i18n/i18n-page.html +++ b/apps/client/src/app/pages/i18n/i18n-page.html @@ -144,15 +144,12 @@
  • Emergency Fund
  • Coverage
  • - The assets tagged as emergency fund - (${emergencyFundHoldingsValue} ${baseCurrency}) - exceed your emergency fund of ${emergencyFund} - ${baseCurrency} + The assets tagged as emergency fund exceed your emergency fund of + ${emergencyFund} ${baseCurrency}
  • Your emergency fund of ${emergencyFund} - ${baseCurrency} is not covered (${coverage} - ${baseCurrency} available) + ${baseCurrency} is not covered
  • Your emergency fund of ${emergencyFund}