implements interpolation

3 months ago · 7241a71075
15 changed files with 22 additions and 18 deletions
--- 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<T extends RuleSettings> implements RuleInterface<T> {
-  protected i18nService = new I18nService();
  private key: string;
  private name: string;

--- 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<Settings> {
  private fees: number;
+  private i18nService = new I18nService();
  private totalInvestment: number;

  public constructor(
--- 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
      </li>
      <li i18n="@@myAccount">My Account</li>
-      <!--
-      <li i18n="@@rule.fee-ratio-initial-investment.exceed">The fees do exceed {{thresholdMax}}% of your initial investment ({feeRatio}%)</li>
-      <li i18n="@@rule.fee-ratio-initial-investment.not-exceed">The fees do exceed {thresholdMax}% of your initial investment ({feeRatio}%)</li>
-      -->
+      <li i18n="@@rule.fee-ratio-initial-investment.exceed">
+        The fees do exceed &#123;thresholdMax&#125;% of your initial investment
+        (&#123;feeRatio&#125;%)
+      </li>
+      <li i18n="@@rule.fee-ratio-initial-investment.not-exceed">
+        The fees do not exceed &#123;thresholdMax&#125;% of your initial
+        investment (&#123;feeRatio&#125;%)
+      </li>
      <li i18n="@@slogan">Open Source Wealth Management Software</li>
    </ul>
  </div>
--- a/apps/client/src/locales/messages.ca.xlf
+++ b/apps/client/src/locales/messages.ca.xlf
@ -3788,7 +3788,7 @@
        <target state="translated">Programari de gestió patrimonial de codi obert</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7b3c319feef05dcc1f487d09dd2a59eb4c50e6d6" datatype="html">
--- a/apps/client/src/locales/messages.de.xlf
+++ b/apps/client/src/locales/messages.de.xlf
@ -5676,7 +5676,7 @@
        <target state="translated">Open Source Software für die Vermögensverwaltung</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@ -5653,7 +5653,7 @@
        <target state="new">Open Source Wealth Management Software</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.fr.xlf
+++ b/apps/client/src/locales/messages.fr.xlf
@ -5652,7 +5652,7 @@
        <target state="translated">Logiciel libre de Gestion de Patrimoine</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.it.xlf
+++ b/apps/client/src/locales/messages.it.xlf
@ -5653,7 +5653,7 @@
        <target state="translated">Software Open Source per la gestione della tua ricchezza</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.nl.xlf
+++ b/apps/client/src/locales/messages.nl.xlf
@ -5652,7 +5652,7 @@
        <target state="translated">Open Source Vermogensbeheer Software</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.pl.xlf
+++ b/apps/client/src/locales/messages.pl.xlf
@ -3407,7 +3407,7 @@
        <target state="translated">Oprogramowanie Open Source do Zarządzania Majątkiem</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7b3c319feef05dcc1f487d09dd2a59eb4c50e6d6" datatype="html">
--- a/apps/client/src/locales/messages.pt.xlf
+++ b/apps/client/src/locales/messages.pt.xlf
@ -5652,7 +5652,7 @@
        <target state="new">Open Source Wealth Management Software</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.tr.xlf
+++ b/apps/client/src/locales/messages.tr.xlf
@ -5652,7 +5652,7 @@
        <target state="translated">Açık Kaynak Varlık Yönetim Yazılımı</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="metaKeywords" datatype="html">
--- a/apps/client/src/locales/messages.uk.xlf
+++ b/apps/client/src/locales/messages.uk.xlf
@ -4004,7 +4004,7 @@
        <target state="translated">Програмне забезпечення управління багатством з відкритим кодом</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7b3c319feef05dcc1f487d09dd2a59eb4c50e6d6" datatype="html">
--- a/apps/client/src/locales/messages.xlf
+++ b/apps/client/src/locales/messages.xlf
@ -3149,7 +3149,7 @@
        <source>Open Source Wealth Management Software</source>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7b3c319feef05dcc1f487d09dd2a59eb4c50e6d6" datatype="html">
--- a/apps/client/src/locales/messages.zh.xlf
+++ b/apps/client/src/locales/messages.zh.xlf
@ -3416,7 +3416,7 @@
        <target state="translated">开源财富管理软件</target>
        <context-group purpose="location">
          <context context-type="sourcefile">apps/client/src/app/pages/i18n/i18n-page.html</context>
-          <context context-type="linenumber">14</context>
+          <context context-type="linenumber">22</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7b3c319feef05dcc1f487d09dd2a59eb4c50e6d6" datatype="html">