diff --git a/apps/api/src/models/rule.ts b/apps/api/src/models/rule.ts index c3c3eac79..4143f4562 100644 --- a/apps/api/src/models/rule.ts +++ b/apps/api/src/models/rule.ts @@ -1,6 +1,5 @@ import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface'; import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; -import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service'; import { groupBy } from '@ghostfolio/common/helper'; import { PortfolioPosition, @@ -14,7 +13,6 @@ import { EvaluationResult } from './interfaces/evaluation-result.interface'; import { RuleInterface } from './interfaces/rule.interface'; export abstract class Rule implements RuleInterface { - protected i18nService = new I18nService(); private key: string; private name: string; diff --git a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts index b6c4c6781..d19d57b9f 100644 --- a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts +++ b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts @@ -1,11 +1,13 @@ import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface'; import { Rule } from '@ghostfolio/api/models/rule'; import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; +import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service'; import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config'; import { UserSettings } from '@ghostfolio/common/interfaces'; export class FeeRatioInitialInvestment extends Rule { private fees: number; + private i18nService = new I18nService(); private totalInvestment: number; public constructor( diff --git a/apps/client/src/app/pages/i18n/i18n-page.html b/apps/client/src/app/pages/i18n/i18n-page.html index 6b9867c95..e6ac9691e 100644 --- a/apps/client/src/app/pages/i18n/i18n-page.html +++ b/apps/client/src/app/pages/i18n/i18n-page.html @@ -11,10 +11,14 @@ performance, portfolio, software, stock, trading, wealth, web3
  • My Account
  • - +
  • + The fees do exceed {thresholdMax}% of your initial investment + ({feeRatio}%) +
  • +
  • + The fees do not exceed {thresholdMax}% of your initial + investment ({feeRatio}%) +
  • Open Source Wealth Management Software
  • diff --git a/apps/client/src/locales/messages.ca.xlf b/apps/client/src/locales/messages.ca.xlf index 5ce42fe53..3fc9c6aa6 100644 --- a/apps/client/src/locales/messages.ca.xlf +++ b/apps/client/src/locales/messages.ca.xlf @@ -3788,7 +3788,7 @@ Programari de gestió patrimonial de codi obert apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index 86c156192..7d582858d 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -5676,7 +5676,7 @@ Open Source Software für die Vermögensverwaltung apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index 01b51e793..f22c03f24 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -5653,7 +5653,7 @@ Open Source Wealth Management Software apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7605,6 +7605,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index 202082270..5b729e5e7 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -5652,7 +5652,7 @@ Logiciel libre de Gestion de Patrimoine apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 005af3ea5..f53195cdd 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -5653,7 +5653,7 @@ Software Open Source per la gestione della tua ricchezza apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7605,6 +7605,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index 142082d28..ba4f426cc 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -5652,7 +5652,7 @@ Open Source Vermogensbeheer Software apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.pl.xlf b/apps/client/src/locales/messages.pl.xlf index 3d5c28be9..78f698920 100644 --- a/apps/client/src/locales/messages.pl.xlf +++ b/apps/client/src/locales/messages.pl.xlf @@ -3407,7 +3407,7 @@ Oprogramowanie Open Source do Zarządzania Majątkiem apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index 9cba3c1bb..9cf513a29 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -5652,7 +5652,7 @@ Open Source Wealth Management Software apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.tr.xlf b/apps/client/src/locales/messages.tr.xlf index cab998274..02a095aa0 100644 --- a/apps/client/src/locales/messages.tr.xlf +++ b/apps/client/src/locales/messages.tr.xlf @@ -5652,7 +5652,7 @@ Açık Kaynak Varlık Yönetim Yazılımı apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.uk.xlf b/apps/client/src/locales/messages.uk.xlf index 4113fc335..d06f45004 100644 --- a/apps/client/src/locales/messages.uk.xlf +++ b/apps/client/src/locales/messages.uk.xlf @@ -4004,7 +4004,7 @@ Програмне забезпечення управління багатством з відкритим кодом apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7604,6 +7604,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index e9a6a6c08..1157dcb2c 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -3149,7 +3149,7 @@ Open Source Wealth Management Software apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -6838,6 +6838,20 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + + diff --git a/apps/client/src/locales/messages.zh.xlf b/apps/client/src/locales/messages.zh.xlf index 01f2342fa..3c046b3de 100644 --- a/apps/client/src/locales/messages.zh.xlf +++ b/apps/client/src/locales/messages.zh.xlf @@ -3416,7 +3416,7 @@ 开源财富管理软件 apps/client/src/app/pages/i18n/i18n-page.html - 14 + 22 @@ -7605,6 +7605,22 @@ 37 + + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 14 + + + + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + The fees do not exceed {thresholdMax}% of your initial investment ({feeRatio}%) + + apps/client/src/app/pages/i18n/i18n-page.html + 18 + +