Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/language localization for static portfolio analysis rule: Currency Cluster Risks (#5038)

csehatt741351fd8a1d49e
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2241ef9eb5..940093881e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Set up the language localization for the static portfolio analysis rule: _Asset Class Cluster Risks_ (Equity)
- Set up the language localization for the static portfolio analysis rule: _Asset Class Cluster Risks_ (Fixed Income)
+- Set up the language localization for the static portfolio analysis rule: _Currency Cluster Risks_ (Investment)
+- Set up the language localization for the static portfolio analysis rule: _Currency Cluster Risks_ (Investment: Base Currency)
### Changed
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 6a580f42fc..fc125656b3 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1300,11 +1300,15 @@ export class PortfolioService {
[
new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
this.exchangeRateDataService,
- Object.values(holdings)
+ this.i18nService,
+ Object.values(holdings),
+ userSettings.language
),
new CurrencyClusterRiskCurrentInvestment(
this.exchangeRateDataService,
- Object.values(holdings)
+ this.i18nService,
+ Object.values(holdings),
+ userSettings.language
)
],
userSettings
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index 161d490d70..7499048033 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -285,11 +285,15 @@ export class UserService {
).getSettings(user.Settings.settings),
CurrencyClusterRiskBaseCurrencyCurrentInvestment:
new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
+ undefined,
+ undefined,
undefined,
undefined
).getSettings(user.Settings.settings),
CurrencyClusterRiskCurrentInvestment:
new CurrencyClusterRiskCurrentInvestment(
+ undefined,
+ undefined,
undefined,
undefined
).getSettings(user.Settings.settings),
diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
index 6de686a9ee..0bf93e9b9e 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@@ -1,6 +1,7 @@
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 { PortfolioPosition, UserSettings } from '@ghostfolio/common/interfaces';
export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Settings> {
@@ -8,10 +9,13 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
public constructor(
protected exchangeRateDataService: ExchangeRateDataService,
- holdings: PortfolioPosition[]
+ private i18nService: I18nService,
+ holdings: PortfolioPosition[],
+ languageCode: string
) {
super(exchangeRateDataService, {
- key: CurrencyClusterRiskBaseCurrencyCurrentInvestment.name
+ key: CurrencyClusterRiskBaseCurrencyCurrentInvestment.name,
+ languageCode
});
this.holdings = holdings;
@@ -48,17 +52,29 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
if (maxItem?.groupKey !== ruleSettings.baseCurrency) {
return {
- evaluation: `The major part of your current investment is not in your base currency (${(
- baseCurrencyValueRatio * 100
- ).toPrecision(3)}% in ${ruleSettings.baseCurrency})`,
+ evaluation: this.i18nService.getTranslation({
+ id: 'rule.currencyClusterRiskBaseCurrencyCurrentInvestment.false',
+ languageCode: this.getLanguageCode(),
+ placeholders: {
+ baseCurrency: ruleSettings.baseCurrency,
+ baseCurrencyValueRatio: (baseCurrencyValueRatio * 100).toPrecision(
+ 3
+ )
+ }
+ }),
value: false
};
}
return {
- evaluation: `The major part of your current investment is in your base currency (${(
- baseCurrencyValueRatio * 100
- ).toPrecision(3)}% in ${ruleSettings.baseCurrency})`,
+ evaluation: this.i18nService.getTranslation({
+ id: 'rule.currencyClusterRiskBaseCurrencyCurrentInvestment.true',
+ languageCode: this.getLanguageCode(),
+ placeholders: {
+ baseCurrency: ruleSettings.baseCurrency,
+ baseCurrencyValueRatio: (baseCurrencyValueRatio * 100).toPrecision(3)
+ }
+ }),
value: true
};
}
@@ -68,7 +84,10 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
}
public getName() {
- return 'Investment: Base Currency';
+ return this.i18nService.getTranslation({
+ id: 'rule.currencyClusterRiskBaseCurrencyCurrentInvestment',
+ languageCode: this.getLanguageCode()
+ });
}
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
diff --git a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
index f19fced5da..7d7b29e784 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
@@ -1,6 +1,7 @@
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 { PortfolioPosition, UserSettings } from '@ghostfolio/common/interfaces';
export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
@@ -8,10 +9,13 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
public constructor(
protected exchangeRateDataService: ExchangeRateDataService,
- holdings: PortfolioPosition[]
+ private i18nService: I18nService,
+ holdings: PortfolioPosition[],
+ languageCode: string
) {
super(exchangeRateDataService, {
- key: CurrencyClusterRiskCurrentInvestment.name
+ key: CurrencyClusterRiskCurrentInvestment.name,
+ languageCode
});
this.holdings = holdings;
@@ -41,21 +45,29 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
if (maxValueRatio > ruleSettings.thresholdMax) {
return {
- evaluation: `Over ${
- ruleSettings.thresholdMax * 100
- }% of your current investment is in ${maxItem.groupKey} (${(
- maxValueRatio * 100
- ).toPrecision(3)}%)`,
+ evaluation: this.i18nService.getTranslation({
+ id: 'rule.currencyClusterRiskCurrentInvestment.false',
+ languageCode: this.getLanguageCode(),
+ placeholders: {
+ currency: maxItem.groupKey as string,
+ maxValueRatio: (maxValueRatio * 100).toPrecision(3),
+ thresholdMax: ruleSettings.thresholdMax * 100
+ }
+ }),
value: false
};
}
return {
- evaluation: `The major part of your current investment is in ${
- maxItem?.groupKey ?? ruleSettings.baseCurrency
- } (${(maxValueRatio * 100).toPrecision(3)}%) and does not exceed ${
- ruleSettings.thresholdMax * 100
- }%`,
+ evaluation: this.i18nService.getTranslation({
+ id: 'rule.currencyClusterRiskCurrentInvestment.true',
+ languageCode: this.getLanguageCode(),
+ placeholders: {
+ currency: maxItem.groupKey as string,
+ maxValueRatio: (maxValueRatio * 100).toPrecision(3),
+ thresholdMax: ruleSettings.thresholdMax * 100
+ }
+ }),
value: true
};
}
@@ -73,7 +85,10 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
}
public getName() {
- return 'Investment';
+ return this.i18nService.getTranslation({
+ id: 'rule.currencyClusterRiskCurrentInvestment',
+ languageCode: this.getLanguageCode()
+ });
}
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
diff --git a/apps/client/src/app/pages/i18n/i18n-page.html b/apps/client/src/app/pages/i18n/i18n-page.html
index 6ffd5b011c..232dabba3c 100644
--- a/apps/client/src/app/pages/i18n/i18n-page.html
+++ b/apps/client/src/app/pages/i18n/i18n-page.html
@@ -57,6 +57,27 @@
($&#123;fixedIncomeValueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
+ <li i18n="@@rule.currencyClusterRiskBaseCurrencyCurrentInvestment">
+ Investment: Base Currency
+ </li>
+ <li i18n="@@rule.currencyClusterRiskBaseCurrencyCurrentInvestment.false">
+ The major part of your current investment is not in your base currency
+ ($&#123;baseCurrencyValueRatio&#125;% in $&#123;baseCurrency&#125;)
+ </li>
+ <li i18n="@@rule.currencyClusterRiskBaseCurrencyCurrentInvestment.true">
+ The major part of your current investment is in your base currency
+ ($&#123;baseCurrencyValueRatio&#125;% in $&#123;baseCurrency&#125;)
+ </li>
+ <li i18n="@@rule.currencyClusterRiskCurrentInvestment">Investment</li>
+ <li i18n="@@rule.currencyClusterRiskCurrentInvestment.false">
+ Over $&#123;thresholdMax&#125;% of your current investment is in
+ $&#123;currency&#125; ($&#123;maxValueRatio&#125;%)
+ </li>
+ <li i18n="@@rule.currencyClusterRiskCurrentInvestment.true">
+ The major part of your current investment is in $&#123;currency&#125;
+ ($&#123;maxValueRatio&#125;%) and does not exceed
+ $&#123;thresholdMax&#125;%
+ </li>
<li i18n="@@rule.emergencyFundSetup">Emergency Fund: Set up</li>
<li i18n="@@rule.emergencyFundSetup.false">
No emergency fund has been set up