diff --git a/frontend/src/locale/setup.ts b/frontend/src/locale/setup.ts index 21e42a6..b0d4c66 100644 --- a/frontend/src/locale/setup.ts +++ b/frontend/src/locale/setup.ts @@ -1,5 +1,6 @@ import i18n from 'i18next'; import { initReactI18next } from 'react-i18next'; +import { APPNAME } from '../ui/theme'; import en from './en/translation.json'; import it from './it/translation.json'; @@ -17,5 +18,8 @@ void i18n.use(initReactI18next).init({ fallbackLng: 'en', interpolation: { escapeValue: false, + defaultVariables: { + APPNAME, + }, }, }); diff --git a/frontend/src/ui/App.tsx b/frontend/src/ui/App.tsx index 5c39e38..102d592 100644 --- a/frontend/src/ui/App.tsx +++ b/frontend/src/ui/App.tsx @@ -38,7 +38,7 @@ import LoyaltyRewardsPage from './pages/LoyaltyRewards'; import ServerSettingsPage from './pages/ServerSettings'; import StrimertulPage from './pages/Strimertul'; import TwitchSettingsPage from './pages/TwitchSettings'; -import { APPNAME, styled } from './theme'; +import { styled } from './theme'; // @ts-expect-error Asset import import spinner from '../assets/icon-loading.svg'; @@ -210,7 +210,7 @@ export default function App(): JSX.Element { }, [ready, connected]); if (connected === ConnectionStatus.NotConnected) { - return ; + return ; } if (connected === ConnectionStatus.AuthenticationNeeded) { diff --git a/frontend/src/ui/pages/AuthDialog.tsx b/frontend/src/ui/pages/AuthDialog.tsx index 730339f..e55bb72 100644 --- a/frontend/src/ui/pages/AuthDialog.tsx +++ b/frontend/src/ui/pages/AuthDialog.tsx @@ -1,7 +1,7 @@ import { styled } from '@stitches/react'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { APPNAME, Button, InputBox, TextBlock } from '../theme'; +import { Button, InputBox, TextBlock } from '../theme'; const AuthWrapper = styled('div', { alignItems: 'center', @@ -59,9 +59,7 @@ export default function AuthDialog(): React.ReactElement { > {t('pages.auth.title')} - - {t('pages.auth.desc', { APPNAME })} - + {t('pages.auth.desc')} {t('pages.auth.no-pwd-note')} diff --git a/frontend/src/ui/pages/Strimertul.tsx b/frontend/src/ui/pages/Strimertul.tsx index b9b7038..6d40f87 100644 --- a/frontend/src/ui/pages/Strimertul.tsx +++ b/frontend/src/ui/pages/Strimertul.tsx @@ -115,7 +115,7 @@ export default function StrimertulPage(): React.ReactElement {
{t('pages.strimertul.need-help')} - {t('pages.strimertul.need-help-p1', { APPNAME })} + {t('pages.strimertul.need-help-p1')} @@ -138,7 +138,6 @@ export default function StrimertulPage(): React.ReactElement { @@ -155,7 +154,6 @@ export default function StrimertulPage(): React.ReactElement { diff --git a/frontend/src/ui/pages/TwitchSettings.tsx b/frontend/src/ui/pages/TwitchSettings.tsx index 0ebde8e..16e1000 100644 --- a/frontend/src/ui/pages/TwitchSettings.tsx +++ b/frontend/src/ui/pages/TwitchSettings.tsx @@ -14,7 +14,6 @@ import DefinitionTable from '../components/DefinitionTable'; import RevealLink from '../components/utils/RevealLink'; import SaveButton from '../components/utils/SaveButton'; import { - APPNAME, Button, ButtonGroup, Checkbox, @@ -372,7 +371,7 @@ function TwitchEventSubSettings() { } return ( <> -

{t('pages.twitch-settings.events.auth-message', { APPNAME })}

+

{t('pages.twitch-settings.events.auth-message')}