From e8afbcad9cfd803c1e3c13ffe0a7f3085f4e8397 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 7 Oct 2022 20:21:52 +0200
Subject: [PATCH] Feature/localize 4 percentage rule (#1327)
* Setup translation for 4% rule
* Update changelog
---
CHANGELOG.md | 2 +
.../app/pages/portfolio/fire/fire-page.html | 2 +-
apps/client/src/locales/messages.de.xlf | 44 +++++++++++--------
apps/client/src/locales/messages.es.xlf | 38 +++++++++-------
apps/client/src/locales/messages.it.xlf | 38 +++++++++-------
apps/client/src/locales/messages.nl.xlf | 38 +++++++++-------
apps/client/src/locales/messages.xlf | 37 +++++++++-------
7 files changed, 120 insertions(+), 79 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a3b19cb..2a45d631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
+- Added support for a translated 4% rule in the _FIRE_ section
+
### Changed
- Improved the caching of the benchmarks in the markets overview (only cache if fetching was successful)
diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.html b/apps/client/src/app/pages/portfolio/fire/fire-page.html
index 89cc79a7..ff60bfc5 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.html
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.html
@@ -35,7 +35,7 @@
}"
>
-
+
If you retire today, you would be able to withdraw
The risk of loss in trading can be substantial. It is not advisable to invest money you may need in the short term.
- Das Ausfallrisiko beim Börsenhandel kann erheblich sein. Es ist nicht ratsam, Geld zu investieren, welches Sie kurzfristig benötigen.
+ Das Ausfallrisiko beim Börsenhandel kann erheblich sein. Es ist nicht ratsam, Geld zu investieren, welches du kurzfristig benötigst.apps/client/src/app/app.component.html55,56
@@ -418,7 +418,7 @@
apps/client/src/app/components/admin-overview/admin-overview.html
- 11
+ 17
@@ -490,7 +490,7 @@
pro Benutzerapps/client/src/app/components/admin-overview/admin-overview.html
- 15
+ 26
@@ -498,7 +498,7 @@
Letzte Daten einholenapps/client/src/app/components/admin-overview/admin-overview.html
- 33
+ 44
@@ -506,7 +506,7 @@
Alle Daten einholenapps/client/src/app/components/admin-overview/admin-overview.html
- 46
+ 57
@@ -518,7 +518,7 @@
apps/client/src/app/components/admin-overview/admin-overview.html
- 60
+ 71
@@ -526,7 +526,7 @@
Wechselkurseapps/client/src/app/components/admin-overview/admin-overview.html
- 67
+ 78
@@ -534,7 +534,7 @@
Währung hinzufügenapps/client/src/app/components/admin-overview/admin-overview.html
- 106
+ 117
@@ -542,7 +542,7 @@
Systemmeldungapps/client/src/app/components/admin-overview/admin-overview.html
- 112
+ 123
@@ -550,7 +550,7 @@
Systemmeldung setzenapps/client/src/app/components/admin-overview/admin-overview.html
- 134
+ 145
@@ -558,7 +558,7 @@
Lese-Modusapps/client/src/app/components/admin-overview/admin-overview.html
- 139
+ 150
@@ -566,7 +566,7 @@
Gutscheincodesapps/client/src/app/components/admin-overview/admin-overview.html
- 152
+ 163
@@ -574,7 +574,7 @@
Hinzufügenapps/client/src/app/components/admin-overview/admin-overview.html
- 187
+ 198
@@ -582,7 +582,7 @@
Verwaltungapps/client/src/app/components/admin-overview/admin-overview.html
- 194
+ 205
@@ -590,7 +590,7 @@
Cache leerenapps/client/src/app/components/admin-overview/admin-overview.html
- 198
+ 209
@@ -2314,7 +2314,7 @@
Datenverwaltungapps/client/src/app/components/admin-overview/admin-overview.html
- 20
+ 31
@@ -2659,7 +2659,7 @@
Account Type
- Account Type
+ Kontotypapps/client/src/app/components/account-detail-dialog/account-detail-dialog.html25
@@ -2667,12 +2667,20 @@
Excluded from Analysis
- Excluded from Analysis
+ Von der Analyse ausgenommenapps/client/src/app/components/portfolio-summary/portfolio-summary.component.html176
+
+ If you retire today, you would be able to withdraw per year or per month, based on your total assets of and a withdrawal rate of 4%.
+ Wenn du heute in den Ruhestand gehen würdest, könnest du pro Jahr oder pro Monat entnehmen, bezogen auf dein Gesamtanlagevermögen von und einer Entnahmerate von 4%.
+
+ apps/client/src/app/pages/portfolio/fire/fire-page.html
+ 38,66
+
+