From 31fac13f8a4d3d214d71c68577472a3a7f370416 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Sun, 24 Jul 2022 17:18:23 +0200 Subject: [PATCH] Translate App, LoginButton --- frontend/src/App.tsx | 41 ++++++++++++++++---------- frontend/src/components/LoginButton.js | 4 ++- frontend/src/translations/de.yaml | 25 ++++++++++++++++ frontend/src/translations/en.yaml | 25 ++++++++++++++++ 4 files changed, 78 insertions(+), 17 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index b8a087b..78a7efa 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -84,31 +84,31 @@ const App = connect((state) => ({login: state.login}))(function App({login}) { {hasMap && ( - - Map - + + {t('App.menu.map')} + )} - Tracks + {t('App.menu.tracks')} - Export + {t('App.menu.export')} {login ? ( <> - My Tracks + {t('App.menu.myTracks')} }> - - + + - + @@ -169,7 +169,9 @@ const App = connect((state) => ({login: state.login}))(function App({login}) { -
About the project
+
+ {t('App.footer.aboutTheProject')} +
@@ -180,36 +182,43 @@ const App = connect((state) => ({login: state.login}))(function App({login}) {
-
Get involved
+
+ {t('App.footer.getInvolved')} +
- Get help in forum + {t('App.footer.getHelpInForum')} - Report an issue + {t('App.footer.reportAnIssue')} - Development + {t('App.footer.development')} -
This installation
+
+ {t('App.footer.thisInstallation')} + This installation +
+ {t('App.footer.privacyPolicy')} Privacy policy + {t('App.footer.imprint')} Imprint @@ -221,7 +230,7 @@ const App = connect((state) => ({login: state.login}))(function App({login}) { target="_blank" rel="noreferrer" > - Version {apiVersion ? `v${apiVersion}` : 'Fetching version...'} + {apiVersion ? t('App.footer.version', {apiVersion}) : t('App.footer.versionLoading')} diff --git a/frontend/src/components/LoginButton.js b/frontend/src/components/LoginButton.js index 192c86e..49e1420 100644 --- a/frontend/src/components/LoginButton.js +++ b/frontend/src/components/LoginButton.js @@ -1,9 +1,11 @@ import React from 'react' import {Button} from 'semantic-ui-react' +import {useTranslation} from 'react-i18next' import api from 'api' export default function LoginButton(props) { + const {t} = useTranslation() const [busy, setBusy] = React.useState(false) const onClick = React.useCallback( @@ -19,7 +21,7 @@ export default function LoginButton(props) { return ( ) } diff --git a/frontend/src/translations/de.yaml b/frontend/src/translations/de.yaml index 1e7eba1..a4cebdf 100644 --- a/frontend/src/translations/de.yaml +++ b/frontend/src/translations/de.yaml @@ -3,4 +3,29 @@ HomePage: App: footer: + aboutTheProject: Über das Projekt + + getInvolved: Mitmachen + getHelpInForum: Hilfe im Forum finden + reportAnIssue: Ein Problem melden + development: Entwicklung + + thisInstallation: Diese Installation + privacyPolicy: Datenschutz + imprint: Impressum + version: Version v{apiVersion} + versionLoading: Version lädt... + changeLanguage: Sprache wechseln + + menu: + map: Karte + tracks: Fahrten + export: Export + myTracks: Meine Fahrten + uploadTracks: Fahrten hochladen + settings: Einstellungen + logout: Abmelden + +LoginButton: + login: Anmelden diff --git a/frontend/src/translations/en.yaml b/frontend/src/translations/en.yaml index c123b3c..d9fb333 100644 --- a/frontend/src/translations/en.yaml +++ b/frontend/src/translations/en.yaml @@ -7,4 +7,29 @@ locales: App: footer: + aboutTheProject: About the project + + getInvolved: Get involved + getHelpInForum: Get help in forum + reportAnIssue: Report an issue + development: Development + + thisInstallation: This installation + privacyPolicy: Privacy policy + imprint: Imprint + version: Version v{apiVersion} + versionLoading: Fetching version... + changeLanguage: Change language + + menu: + map: Map + tracks: Tracks + export: Export + myTracks: My tracks + uploadTracks: Upload tracks + settings: Settings + logout: Logout + +LoginButton: + login: Login