Browse Source

Add emergency fund coverage rule

pull/7538/head
Thomas Kaul 3 weeks ago
parent
commit
a907381322
  1. 7
      apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
  2. 5
      apps/api/src/services/i18n/i18n.service.ts
  3. 9
      apps/client/src/app/pages/i18n/i18n-page.html

7
apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts

@ -43,10 +43,6 @@ export class EmergencyFundCoverage extends Rule<Settings> {
baseCurrency: ruleSettings.baseCurrency, baseCurrency: ruleSettings.baseCurrency,
emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString( emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString(
ruleSettings.locale ruleSettings.locale
),
emergencyFundHoldingsValue:
this.emergencyFundHoldingsValueInBaseCurrency.toLocaleString(
ruleSettings.locale
) )
} }
}), }),
@ -65,9 +61,6 @@ export class EmergencyFundCoverage extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
baseCurrency: ruleSettings.baseCurrency, baseCurrency: ruleSettings.baseCurrency,
coverage: coverageInBaseCurrency.toLocaleString(
ruleSettings.locale
),
emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString( emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString(
ruleSettings.locale ruleSettings.locale
) )

5
apps/api/src/services/i18n/i18n.service.ts

@ -45,7 +45,10 @@ export class I18nService implements OnModuleInit {
if (placeholders) { if (placeholders) {
for (const [key, value] of Object.entries(placeholders)) { for (const [key, value] of Object.entries(placeholders)) {
translatedText = translatedText.replace(`\${${key}}`, String(value)); translatedText = translatedText.replace(
new RegExp(`\\$\\{${key}\\}`, 'g'),
String(value)
);
} }
} }

9
apps/client/src/app/pages/i18n/i18n-page.html

@ -144,15 +144,12 @@
<li i18n="@@rule.emergencyFund.category">Emergency Fund</li> <li i18n="@@rule.emergencyFund.category">Emergency Fund</li>
<li i18n="@@rule.emergencyFundCoverage">Coverage</li> <li i18n="@@rule.emergencyFundCoverage">Coverage</li>
<li i18n="@@rule.emergencyFundCoverage.false.over"> <li i18n="@@rule.emergencyFundCoverage.false.over">
The assets tagged as emergency fund The assets tagged as emergency fund exceed your emergency fund of
($&#123;emergencyFundHoldingsValue&#125; $&#123;baseCurrency&#125;) $&#123;emergencyFund&#125; $&#123;baseCurrency&#125;
exceed your emergency fund of $&#123;emergencyFund&#125;
$&#123;baseCurrency&#125;
</li> </li>
<li i18n="@@rule.emergencyFundCoverage.false.under"> <li i18n="@@rule.emergencyFundCoverage.false.under">
Your emergency fund of $&#123;emergencyFund&#125; Your emergency fund of $&#123;emergencyFund&#125;
$&#123;baseCurrency&#125; is not covered ($&#123;coverage&#125; $&#123;baseCurrency&#125; is not covered
$&#123;baseCurrency&#125; available)
</li> </li>
<li i18n="@@rule.emergencyFundCoverage.true"> <li i18n="@@rule.emergencyFundCoverage.true">
Your emergency fund of $&#123;emergencyFund&#125; Your emergency fund of $&#123;emergencyFund&#125;

Loading…
Cancel
Save