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 0a3b19cbc..2a45d6314 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 89cc79a76..ff60bfc50 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.html 55,56 @@ -418,7 +418,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 11 + 17 @@ -490,7 +490,7 @@ pro Benutzer apps/client/src/app/components/admin-overview/admin-overview.html - 15 + 26 @@ -498,7 +498,7 @@ Letzte Daten einholen apps/client/src/app/components/admin-overview/admin-overview.html - 33 + 44 @@ -506,7 +506,7 @@ Alle Daten einholen apps/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 @@ Wechselkurse apps/client/src/app/components/admin-overview/admin-overview.html - 67 + 78 @@ -534,7 +534,7 @@ Währung hinzufügen apps/client/src/app/components/admin-overview/admin-overview.html - 106 + 117 @@ -542,7 +542,7 @@ Systemmeldung apps/client/src/app/components/admin-overview/admin-overview.html - 112 + 123 @@ -550,7 +550,7 @@ Systemmeldung setzen apps/client/src/app/components/admin-overview/admin-overview.html - 134 + 145 @@ -558,7 +558,7 @@ Lese-Modus apps/client/src/app/components/admin-overview/admin-overview.html - 139 + 150 @@ -566,7 +566,7 @@ Gutscheincodes apps/client/src/app/components/admin-overview/admin-overview.html - 152 + 163 @@ -574,7 +574,7 @@ Hinzufügen apps/client/src/app/components/admin-overview/admin-overview.html - 187 + 198 @@ -582,7 +582,7 @@ Verwaltung apps/client/src/app/components/admin-overview/admin-overview.html - 194 + 205 @@ -590,7 +590,7 @@ Cache leeren apps/client/src/app/components/admin-overview/admin-overview.html - 198 + 209 @@ -2314,7 +2314,7 @@ Datenverwaltung apps/client/src/app/components/admin-overview/admin-overview.html - 20 + 31 @@ -2659,7 +2659,7 @@ Account Type - Account Type + Kontotyp apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html 25 @@ -2667,12 +2667,20 @@ Excluded from Analysis - Excluded from Analysis + Von der Analyse ausgenommen apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html 176 + + 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 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index 4c7ec50c5..6f9ee12d4 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -419,7 +419,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 11 + 17 @@ -491,7 +491,7 @@ por usario apps/client/src/app/components/admin-overview/admin-overview.html - 15 + 26 @@ -499,7 +499,7 @@ Recoger datos recientes apps/client/src/app/components/admin-overview/admin-overview.html - 33 + 44 @@ -507,7 +507,7 @@ Recoger todos los datos apps/client/src/app/components/admin-overview/admin-overview.html - 46 + 57 @@ -519,7 +519,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 60 + 71 @@ -527,7 +527,7 @@ Tipos de cambio apps/client/src/app/components/admin-overview/admin-overview.html - 67 + 78 @@ -535,7 +535,7 @@ Añadir divisa apps/client/src/app/components/admin-overview/admin-overview.html - 106 + 117 @@ -543,7 +543,7 @@ Mensaje del sistema apps/client/src/app/components/admin-overview/admin-overview.html - 112 + 123 @@ -551,7 +551,7 @@ Establecer mensaje apps/client/src/app/components/admin-overview/admin-overview.html - 134 + 145 @@ -559,7 +559,7 @@ Modo de solo lectura apps/client/src/app/components/admin-overview/admin-overview.html - 139 + 150 @@ -567,7 +567,7 @@ Cupones apps/client/src/app/components/admin-overview/admin-overview.html - 152 + 163 @@ -575,7 +575,7 @@ Añadir apps/client/src/app/components/admin-overview/admin-overview.html - 187 + 198 @@ -583,7 +583,7 @@ Tareas domésticas apps/client/src/app/components/admin-overview/admin-overview.html - 194 + 205 @@ -591,7 +591,7 @@ Limpiar caché apps/client/src/app/components/admin-overview/admin-overview.html - 198 + 209 @@ -2315,7 +2315,7 @@ Gestión de los datos apps/client/src/app/components/admin-overview/admin-overview.html - 20 + 31 @@ -2674,6 +2674,14 @@ 176 + + 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%. + 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%. + + apps/client/src/app/pages/portfolio/fire/fire-page.html + 38,66 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 33b03ad03..bbec1f5ed 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -419,7 +419,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 11 + 17 @@ -491,7 +491,7 @@ per utente apps/client/src/app/components/admin-overview/admin-overview.html - 15 + 26 @@ -499,7 +499,7 @@ Raccogli dati recenti apps/client/src/app/components/admin-overview/admin-overview.html - 33 + 44 @@ -507,7 +507,7 @@ Raccogli tutti i dati apps/client/src/app/components/admin-overview/admin-overview.html - 46 + 57 @@ -519,7 +519,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 60 + 71 @@ -527,7 +527,7 @@ Tassi di cambio apps/client/src/app/components/admin-overview/admin-overview.html - 67 + 78 @@ -535,7 +535,7 @@ Aggiungi valuta apps/client/src/app/components/admin-overview/admin-overview.html - 106 + 117 @@ -543,7 +543,7 @@ Messaggio di sistema apps/client/src/app/components/admin-overview/admin-overview.html - 112 + 123 @@ -551,7 +551,7 @@ Imposta messaggio apps/client/src/app/components/admin-overview/admin-overview.html - 134 + 145 @@ -559,7 +559,7 @@ Modalità di sola lettura apps/client/src/app/components/admin-overview/admin-overview.html - 139 + 150 @@ -567,7 +567,7 @@ Buoni sconto apps/client/src/app/components/admin-overview/admin-overview.html - 152 + 163 @@ -575,7 +575,7 @@ Aggiungi apps/client/src/app/components/admin-overview/admin-overview.html - 187 + 198 @@ -583,7 +583,7 @@ Bilancio domestico apps/client/src/app/components/admin-overview/admin-overview.html - 194 + 205 @@ -591,7 +591,7 @@ Svuota la cache apps/client/src/app/components/admin-overview/admin-overview.html - 198 + 209 @@ -2315,7 +2315,7 @@ Gestione dei dati apps/client/src/app/components/admin-overview/admin-overview.html - 20 + 31 @@ -2674,6 +2674,14 @@ 25 + + 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%. + 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%. + + apps/client/src/app/pages/portfolio/fire/fire-page.html + 38,66 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index 9a26ef226..020c00e7c 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -418,7 +418,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 11 + 17 @@ -490,7 +490,7 @@ per gebruiker apps/client/src/app/components/admin-overview/admin-overview.html - 15 + 26 @@ -498,7 +498,7 @@ Verzamel recente gegevens apps/client/src/app/components/admin-overview/admin-overview.html - 33 + 44 @@ -506,7 +506,7 @@ Alle gegevens verzamelen apps/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 @@ Wisselkoersen apps/client/src/app/components/admin-overview/admin-overview.html - 67 + 78 @@ -534,7 +534,7 @@ Valuta toevoegen apps/client/src/app/components/admin-overview/admin-overview.html - 106 + 117 @@ -542,7 +542,7 @@ Systeembericht apps/client/src/app/components/admin-overview/admin-overview.html - 112 + 123 @@ -550,7 +550,7 @@ Bericht instellen apps/client/src/app/components/admin-overview/admin-overview.html - 134 + 145 @@ -558,7 +558,7 @@ Alleen lezen apps/client/src/app/components/admin-overview/admin-overview.html - 139 + 150 @@ -566,7 +566,7 @@ Coupons apps/client/src/app/components/admin-overview/admin-overview.html - 152 + 163 @@ -574,7 +574,7 @@ Toevoegen apps/client/src/app/components/admin-overview/admin-overview.html - 187 + 198 @@ -582,7 +582,7 @@ Huishouding apps/client/src/app/components/admin-overview/admin-overview.html - 194 + 205 @@ -590,7 +590,7 @@ Cache legen apps/client/src/app/components/admin-overview/admin-overview.html - 198 + 209 @@ -2314,7 +2314,7 @@ Gegevensbeheer apps/client/src/app/components/admin-overview/admin-overview.html - 20 + 31 @@ -2673,6 +2673,14 @@ 176 + + 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%. + 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%. + + apps/client/src/app/pages/portfolio/fire/fire-page.html + 38,66 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index b5469d90a..07fffd51d 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -386,7 +386,7 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 11 + 17 @@ -449,21 +449,21 @@ per User apps/client/src/app/components/admin-overview/admin-overview.html - 15 + 26 Gather Recent Data apps/client/src/app/components/admin-overview/admin-overview.html - 33 + 44 Gather All Data apps/client/src/app/components/admin-overview/admin-overview.html - 46 + 57 @@ -474,70 +474,70 @@ apps/client/src/app/components/admin-overview/admin-overview.html - 60 + 71 Exchange Rates apps/client/src/app/components/admin-overview/admin-overview.html - 67 + 78 Add Currency apps/client/src/app/components/admin-overview/admin-overview.html - 106 + 117 System Message apps/client/src/app/components/admin-overview/admin-overview.html - 112 + 123 Set Message apps/client/src/app/components/admin-overview/admin-overview.html - 134 + 145 Read-only Mode apps/client/src/app/components/admin-overview/admin-overview.html - 139 + 150 Coupons apps/client/src/app/components/admin-overview/admin-overview.html - 152 + 163 Add apps/client/src/app/components/admin-overview/admin-overview.html - 187 + 198 Housekeeping apps/client/src/app/components/admin-overview/admin-overview.html - 194 + 205 Flush Cache apps/client/src/app/components/admin-overview/admin-overview.html - 198 + 209 @@ -2070,7 +2070,7 @@ Data Management apps/client/src/app/components/admin-overview/admin-overview.html - 20 + 31 @@ -2389,6 +2389,13 @@ 25 + + 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%. + + apps/client/src/app/pages/portfolio/fire/fire-page.html + 38,66 + +