Feature/improve i18n (#1183)

* Improve i18n

* Update changelog

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Improved the language localization for German (`de`)
+
 ## 1.181.2 - 21.08.2022
 
 ### Added

apps/client/src/app/components/investment-chart/investment-chart.component.ts

@@ -122,7 +122,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
           data: this.investments.map((position) => {
             return position.investment;
           }),
-          label: 'Investment',
+          label: $localize`Deposit`,
           segment: {
             borderColor: (context: unknown) =>
               this.isInFuture(

apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts

@@ -54,8 +54,8 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
   };
   public period = 'current';
   public periodOptions: ToggleOption[] = [
-    { label: 'Initial', value: 'original' },
+    { label: $localize`Initial`, value: 'original' },
-    { label: 'Current', value: 'current' }
+    { label: $localize`Current`, value: 'current' }
   ];
   public placeholder = '';
   public portfolioDetails: PortfolioDetails;

apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

@@ -26,8 +26,8 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
   public investmentsByMonth: InvestmentItem[];
   public mode: GroupBy;
   public modeOptions: ToggleOption[] = [
-    { label: 'Monthly', value: 'month' },
+    { label: $localize`Monthly`, value: 'month' },
-    { label: 'Accumulating', value: undefined }
+    { label: $localize`Accumulating`, value: undefined }
   ];
   public top3: Position[];
   public user: User;

apps/client/src/app/pages/portfolio/analysis/analysis-page.html

@@ -52,7 +52,7 @@
       <mat-card class="mb-3">
         <mat-card-header>
           <mat-card-title class="align-items-center d-flex" i18n
-            >Top 3</mat-card-title
+            >Top</mat-card-title
           >
         </mat-card-header>
         <mat-card-content>
@@ -88,7 +88,7 @@
       <mat-card class="mb-3">
         <mat-card-header>
           <mat-card-title class="align-items-center d-flex" i18n
-            >Bottom 3</mat-card-title
+            >Bottom</mat-card-title
           >
         </mat-card-header>
         <mat-card-content>

apps/client/src/locales/messages.de.xlf

@@ -1709,16 +1709,16 @@
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="50167734b0d4b546842e9f548eb89480a72d0fa1" datatype="html">
+      <trans-unit id="6ae1c94f6bad274424f97e9bc8766242c1577447" datatype="html">
-        <source>Top 3</source>
+        <source>Top</source>
         <target state="translated">Gewinner</target>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="d4fb5bf78e78dd3c791bcec0dcddddb1fdc9d51a" datatype="html">
+      <trans-unit id="6723d5c967329a3ac75524cf0c1af5ced022b9a3" datatype="html">
-        <source>Bottom 3</source>
+        <source>Bottom</source>
         <target state="translated">Verlierer</target>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.html</context>
@@ -2493,6 +2493,74 @@
           <context context-type="linenumber">171</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="e34e2478d2d30c9d01758d01b7212411171b9bd5" datatype="html">
+        <source>Projected Total Amount</source>
+        <target state="translated">Geschätzter Gesamtbetrag</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2937311350146031865" datatype="html">
+        <source>Initial</source>
+        <target state="new">Beginn</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6603000223840533819" datatype="html">
+        <source>Current</source>
+        <target state="translated">Aktuell</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6762743264882388498" datatype="html">
+        <source>Monthly</source>
+        <target state="translated">Monatlich</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1975246224413290232" datatype="html">
+        <source>Accumulating</source>
+        <target state="translated">Aufsummiert</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5213771062241898526" datatype="html">
+        <source>Deposit</source>
+        <target state="translated">Einlage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>
+          <context context-type="linenumber">276</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3441715041566940420" datatype="html">
+        <source>Interest</source>
+        <target state="translated">Verzinsung</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>
+          <context context-type="linenumber">286</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1054498214311181686" datatype="html">
+        <source>Savings</source>
+        <target state="new">Ersparnisse</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>
+          <context context-type="linenumber">296</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>

apps/client/src/locales/messages.xlf

@@ -1534,15 +1534,15 @@
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="50167734b0d4b546842e9f548eb89480a72d0fa1" datatype="html">
+      <trans-unit id="6ae1c94f6bad274424f97e9bc8766242c1577447" datatype="html">
-        <source>Top 3</source>
+        <source>Top</source>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="d4fb5bf78e78dd3c791bcec0dcddddb1fdc9d51a" datatype="html">
+      <trans-unit id="6723d5c967329a3ac75524cf0c1af5ced022b9a3" datatype="html">
-        <source>Bottom 3</source>
+        <source>Bottom</source>
         <context-group purpose="location">
           <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.html</context>
           <context context-type="linenumber">91</context>
@@ -2227,6 +2227,66 @@
           <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="e34e2478d2d30c9d01758d01b7212411171b9bd5" datatype="html">
+        <source>Projected Total Amount</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1054498214311181686" datatype="html">
+        <source>Savings</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>
+          <context context-type="linenumber">296</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1975246224413290232" datatype="html">
+        <source>Accumulating</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2937311350146031865" datatype="html">
+        <source>Initial</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3441715041566940420" datatype="html">
+        <source>Interest</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>
+          <context context-type="linenumber">286</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5213771062241898526" datatype="html">
+        <source>Deposit</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+          <context context-type="linenumber">125</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>
+          <context context-type="linenumber">276</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6603000223840533819" datatype="html">
+        <source>Current</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6762743264882388498" datatype="html">
+        <source>Monthly</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
     </body>
   </file>
 </xliff>

libs/ui/src/lib/fire-calculator/fire-calculator.component.html

@@ -35,13 +35,14 @@
         </mat-form-field>
 
         <gf-value
-          label="Projected Total Amount"
+          i18n
           size="large"
           [currency]="currency"
           [isCurrency]="true"
           [locale]="locale"
           [value]="projectedTotalAmount"
-        ></gf-value>
+          >Projected Total Amount</gf-value
+        >
       </form>
     </div>
     <div class="col-md-9 text-center">

libs/ui/src/lib/fire-calculator/fire-calculator.component.ts

@@ -273,7 +273,7 @@ export class FireCalculatorComponent
     const datasetDeposit = {
       backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
       data: [],
-      label: 'Deposit'
+      label: $localize`Deposit`
     };
 
     const datasetInterest = {
@@ -283,7 +283,7 @@ export class FireCalculatorComponent
         .lighten(0.5)
         .hex(),
       data: [],
-      label: 'Interest'
+      label: $localize`Interest`
     };
 
     const datasetSavings = {
@@ -293,7 +293,7 @@ export class FireCalculatorComponent
         .lighten(0.25)
         .hex(),
       data: [],
-      label: 'Savings'
+      label: $localize`Savings`
     };
 
     for (let period = 1; period <= t; period++) {