diff --git a/src/components/landing/layout/footer/powered-by-links.tsx b/src/components/landing/layout/footer/powered-by-links.tsx
index 2f18b6158..337203b40 100644
--- a/src/components/landing/layout/footer/powered-by-links.tsx
+++ b/src/components/landing/layout/footer/powered-by-links.tsx
@@ -18,14 +18,14 @@ export const PoweredByLinks: React.FC = () => {
return (
-
+
{
Object.entries({ ...defaultLinks, ...(config.specialLinks) }).map(([i18nKey, href]) =>
|
-
+
)
}
diff --git a/src/components/landing/layout/footer/social-links.tsx b/src/components/landing/layout/footer/social-links.tsx
index 2db3fff54..f7410eed5 100644
--- a/src/components/landing/layout/footer/social-links.tsx
+++ b/src/components/landing/layout/footer/social-links.tsx
@@ -6,7 +6,7 @@ const SocialLink: React.FC = () => {
useTranslation()
return (
- ,
,
,
diff --git a/src/components/landing/layout/navigation/header-bar/header-bar.tsx b/src/components/landing/layout/navigation/header-bar/header-bar.tsx
index 6b3a562ce..fc7de917e 100644
--- a/src/components/landing/layout/navigation/header-bar/header-bar.tsx
+++ b/src/components/landing/layout/navigation/header-bar/header-bar.tsx
@@ -19,10 +19,10 @@ const HeaderBar: React.FC = () => {
-
+
-
+
diff --git a/src/components/landing/layout/navigation/new-guest-note-button.tsx b/src/components/landing/layout/navigation/new-guest-note-button.tsx
index 85e23535f..2cbeaca74 100644
--- a/src/components/landing/layout/navigation/new-guest-note-button.tsx
+++ b/src/components/landing/layout/navigation/new-guest-note-button.tsx
@@ -5,16 +5,16 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { Trans, useTranslation } from 'react-i18next'
export const NewGuestNoteButton: React.FC = () => {
- const { i18n } = useTranslation()
+ const { t } = useTranslation()
return (
-
+
)
diff --git a/src/components/landing/layout/navigation/new-user-note-button.tsx b/src/components/landing/layout/navigation/new-user-note-button.tsx
index 70082e967..f249577e1 100644
--- a/src/components/landing/layout/navigation/new-user-note-button.tsx
+++ b/src/components/landing/layout/navigation/new-user-note-button.tsx
@@ -5,16 +5,16 @@ import React from 'react'
import { Trans, useTranslation } from 'react-i18next'
export const NewUserNoteButton: React.FC = () => {
- const { i18n } = useTranslation()
+ const { t } = useTranslation()
return (
-
+
diff --git a/src/components/landing/layout/navigation/sign-in-button.tsx b/src/components/landing/layout/navigation/sign-in-button.tsx
index e148c61df..c2ef6cd1a 100644
--- a/src/components/landing/layout/navigation/sign-in-button.tsx
+++ b/src/components/landing/layout/navigation/sign-in-button.tsx
@@ -4,15 +4,15 @@ import { Trans, useTranslation } from 'react-i18next'
import { LinkContainer } from 'react-router-bootstrap'
export const SignInButton: React.FC = () => {
- const { i18n } = useTranslation()
+ const { t } = useTranslation()
return (
-
+
)
diff --git a/src/components/landing/layout/navigation/user-dropdown/user-dropdown.tsx b/src/components/landing/layout/navigation/user-dropdown/user-dropdown.tsx
index d0e25c7af..557516d6c 100644
--- a/src/components/landing/layout/navigation/user-dropdown/user-dropdown.tsx
+++ b/src/components/landing/layout/navigation/user-dropdown/user-dropdown.tsx
@@ -5,10 +5,11 @@ import { useSelector } from 'react-redux'
import { ApplicationState } from '../../../../../redux'
import { LinkContainer } from 'react-router-bootstrap'
import { clearUser } from '../../../../../redux/user/methods'
-import { Trans } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
import { UserAvatar } from '../../user-avatar/user-avatar'
export const UserDropdown: React.FC = () => {
+ useTranslation();
const user = useSelector((state: ApplicationState) => state.user)
return (
@@ -21,25 +22,25 @@ export const UserDropdown: React.FC = () => {
-
+
-
+
-
+
{
clearUser()
}}>
-
+
)
diff --git a/src/components/landing/layout/user-avatar/user-avatar.tsx b/src/components/landing/layout/user-avatar/user-avatar.tsx
index cae88688c..be84cd67e 100644
--- a/src/components/landing/layout/user-avatar/user-avatar.tsx
+++ b/src/components/landing/layout/user-avatar/user-avatar.tsx
@@ -8,6 +8,7 @@ export interface UserAvatarProps {
}
const UserAvatar: React.FC = ({ name, photo, additionalClasses = '' }) => {
+ // ToDo: add Translation Key for Avatar of ${name}
return (
{
{title}
{sourceCodeLink
- ? : null}
+ ? : null}
{issueTrackerLink
- ? : null}
+ ? : null}
)
@@ -34,15 +34,15 @@ export const VersionInfo: React.FC = () => {
-
+
- {column(t('serverVersion'), serverVersion.version, serverVersion.sourceCodeUrl, serverVersion.issueTrackerUrl)}
- {column(t('clientVersion'), frontendVersion.version, frontendVersion.sourceCodeUrl, frontendVersion.issueTrackerUrl)}
+ {column(t('landing.versionInfo.serverVersion'), serverVersion.version, serverVersion.sourceCodeUrl, serverVersion.issueTrackerUrl)}
+ {column(t('landing.versionInfo.clientVersion'), frontendVersion.version, frontendVersion.sourceCodeUrl, frontendVersion.issueTrackerUrl)}
diff --git a/src/components/landing/layout/version-info/version-input-field.tsx b/src/components/landing/layout/version-info/version-input-field.tsx
index 9b3364e04..db5969b1d 100644
--- a/src/components/landing/layout/version-info/version-input-field.tsx
+++ b/src/components/landing/layout/version-info/version-input-field.tsx
@@ -1,13 +1,14 @@
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import React, { Fragment, useRef, useState } from 'react'
import { Button, FormControl, InputGroup, Overlay, Tooltip } from 'react-bootstrap'
-import { Trans } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
export interface VersionInputFieldProps {
version: string
}
export const VersionInputField: React.FC = ({ version }) => {
+ useTranslation();
const inputField = useRef(null)
const [showCopiedTooltip, setShowCopiedTooltip] = useState(false)
@@ -25,7 +26,7 @@ export const VersionInputField: React.FC = ({ version })
{(props) => (
-
+
)}
diff --git a/src/components/landing/pages/history/history-card/history-card.tsx b/src/components/landing/pages/history/history-card/history-card.tsx
index 3c092287c..3a3b5dedc 100644
--- a/src/components/landing/pages/history/history-card/history-card.tsx
+++ b/src/components/landing/pages/history/history-card/history-card.tsx
@@ -4,12 +4,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { PinButton } from '../common/pin-button'
import { CloseButton } from '../common/close-button'
import moment from 'moment'
-import { useTranslation } from 'react-i18next'
import { HistoryEntryProps } from '../history-content/history-content'
import { formatHistoryDate } from '../../../../../utils/historyUtils'
export const HistoryCard: React.FC = ({ entry, onPinClick }) => {
- useTranslation()
return (
diff --git a/src/components/landing/pages/history/history-content/history-content.tsx b/src/components/landing/pages/history/history-content/history-content.tsx
index c9e78efcc..d6e54dd65 100644
--- a/src/components/landing/pages/history/history-content/history-content.tsx
+++ b/src/components/landing/pages/history/history-content/history-content.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, useState } from 'react'
import { HistoryEntry, pinClick } from '../history'
import { HistoryTable } from '../history-table/history-table'
import { Alert, Row } from 'react-bootstrap'
-import { Trans } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
import { HistoryCardList } from '../history-card/history-card-list'
import { ViewStateEnum } from '../history-toolbar/history-toolbar'
import { PagerPagination } from '../../../../pagination/pager-pagination'
@@ -26,6 +26,7 @@ export interface HistoryEntriesProps {
}
export const HistoryContent: React.FC = ({ viewState, entries, onPinClick }) => {
+ useTranslation()
const [pageIndex, setPageIndex] = useState(0)
const [lastPageIndex, setLastPageIndex] = useState(0)
@@ -33,7 +34,7 @@ export const HistoryContent: React.FC = ({ viewState, entri
return (
-
+
)
diff --git a/src/components/landing/pages/history/history-table/history-table-row.tsx b/src/components/landing/pages/history/history-table/history-table-row.tsx
index 3c03663bb..72870e798 100644
--- a/src/components/landing/pages/history/history-table/history-table-row.tsx
+++ b/src/components/landing/pages/history/history-table/history-table-row.tsx
@@ -1,13 +1,11 @@
import React from 'react'
import { PinButton } from '../common/pin-button'
import { CloseButton } from '../common/close-button'
-import { useTranslation } from 'react-i18next'
import { HistoryEntryProps } from '../history-content/history-content'
import { formatHistoryDate } from '../../../../../utils/historyUtils'
import { Badge } from 'react-bootstrap'
export const HistoryTableRow: React.FC = ({ entry, onPinClick }) => {
- useTranslation()
return (
{entry.title} |
diff --git a/src/components/landing/pages/history/history-table/history-table.tsx b/src/components/landing/pages/history/history-table/history-table.tsx
index c927a2e19..7af5c6f64 100644
--- a/src/components/landing/pages/history/history-table/history-table.tsx
+++ b/src/components/landing/pages/history/history-table/history-table.tsx
@@ -2,18 +2,19 @@ import React from 'react'
import { Table } from 'react-bootstrap'
import { HistoryTableRow } from './history-table-row'
import { HistoryEntriesProps } from '../history-content/history-content'
-import { Trans } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
import { Pager } from '../../../../pagination/pager'
export const HistoryTable: React.FC = ({ entries, onPinClick, pageIndex, onLastPageIndexChange }) => {
+ useTranslation()
return (
- |
- |
- |
- |
+ |
+ |
+ |
+ |
diff --git a/src/components/landing/pages/history/history-toolbar/clear-history-button.tsx b/src/components/landing/pages/history/history-toolbar/clear-history-button.tsx
index e3f91d3e0..0e273b366 100644
--- a/src/components/landing/pages/history/history-toolbar/clear-history-button.tsx
+++ b/src/components/landing/pages/history/history-toolbar/clear-history-button.tsx
@@ -16,20 +16,22 @@ export const ClearHistoryButton: React.FC = ({ onClearH
return (
-
-
+
@@ -37,7 +37,7 @@ export const CoverButtons: React.FC = () => {
variant="primary"
size="lg"
>
-
+
diff --git a/src/components/landing/pages/intro/feature-links.tsx b/src/components/landing/pages/intro/feature-links.tsx
index 53380034a..225020ff7 100644
--- a/src/components/landing/pages/intro/feature-links.tsx
+++ b/src/components/landing/pages/intro/feature-links.tsx
@@ -12,7 +12,7 @@ export const FeatureLinks: React.FC = () => {
-
+
@@ -20,7 +20,7 @@ export const FeatureLinks: React.FC = () => {
-
+
@@ -28,7 +28,7 @@ export const FeatureLinks: React.FC = () => {
-
+
diff --git a/src/components/landing/pages/intro/intro.tsx b/src/components/landing/pages/intro/intro.tsx
index 74afe841c..f902f620e 100644
--- a/src/components/landing/pages/intro/intro.tsx
+++ b/src/components/landing/pages/intro/intro.tsx
@@ -6,7 +6,7 @@ import { FeatureLinks } from './feature-links'
import { CoverButtons } from './cover-buttons/cover-buttons'
const Intro: React.FC = () => {
- useTranslation()
+ const { t } = useTranslation()
return (
@@ -14,12 +14,12 @@ const Intro: React.FC = () => {
CodiMD
-
+
-
+
)
diff --git a/src/components/landing/pages/login/auth/via-email.tsx b/src/components/landing/pages/login/auth/via-email.tsx
index bde12feca..909313d7d 100644
--- a/src/components/landing/pages/login/auth/via-email.tsx
+++ b/src/components/landing/pages/login/auth/via-email.tsx
@@ -24,7 +24,7 @@ export const ViaEMail: React.FC = () => {
-
+
@@ -32,7 +32,7 @@ export const ViaEMail: React.FC = () => {
isInvalid={error}
type="email"
size="sm"
- placeholder={t('email')}
+ placeholder={t('login.auth.email')}
onChange={(event) => setEmail(event.currentTarget.value)} className="bg-dark text-white"
/>
@@ -42,20 +42,20 @@ export const ViaEMail: React.FC = () => {
isInvalid={error}
type="password"
size="sm"
- placeholder={t('password')}
+ placeholder={t('login.auth.password')}
onChange={(event) => setPassword(event.currentTarget.value)}
className="bg-dark text-white"/>
-
+
-
+
diff --git a/src/components/landing/pages/login/auth/via-ldap.tsx b/src/components/landing/pages/login/auth/via-ldap.tsx
index c627b02e0..5cfc1e90b 100644
--- a/src/components/landing/pages/login/auth/via-ldap.tsx
+++ b/src/components/landing/pages/login/auth/via-ldap.tsx
@@ -35,7 +35,7 @@ export const ViaLdap: React.FC = () => {
-
+
@@ -43,7 +43,7 @@ export const ViaLdap: React.FC = () => {
isInvalid={error}
type="text"
size="sm"
- placeholder={t('username')}
+ placeholder={t('login.auth.username')}
onChange={(event) => setUsername(event.currentTarget.value)} className="bg-dark text-white"
/>
@@ -53,19 +53,19 @@ export const ViaLdap: React.FC = () => {
isInvalid={error}
type="password"
size="sm"
- placeholder={t('password')}
+ placeholder={t('login.auth.password')}
onChange={(event) => setPassword(event.currentTarget.value)}
className="bg-dark text-white"/>
-
+
-
+
diff --git a/src/components/landing/pages/login/auth/via-openid.tsx b/src/components/landing/pages/login/auth/via-openid.tsx
index 88b442e3e..fe37610ed 100644
--- a/src/components/landing/pages/login/auth/via-openid.tsx
+++ b/src/components/landing/pages/login/auth/via-openid.tsx
@@ -22,7 +22,7 @@ export const ViaOpenId: React.FC = () => {
-
+
diff --git a/src/components/landing/pages/login/login.tsx b/src/components/landing/pages/login/login.tsx
index 5ea95d6c9..4ed9c7fe5 100644
--- a/src/components/landing/pages/login/login.tsx
+++ b/src/components/landing/pages/login/login.tsx
@@ -53,7 +53,7 @@ export const Login: React.FC = () => {
-
+
{
Object.values(OneClickType)