diff --git a/front/components/UI/ScaffoldAuth.tsx b/front/components/UI/ScaffoldAuth.tsx index bcb9fd3..47efadf 100644 --- a/front/components/UI/ScaffoldAuth.tsx +++ b/front/components/UI/ScaffoldAuth.tsx @@ -4,6 +4,7 @@ import { FunctionComponent } from 'react'; import { Linking, Platform, useWindowDimensions } from 'react-native'; import ButtonBase from './ButtonBase'; import { translate } from '../../i18n/i18n'; +import { useTranslation } from 'react-i18next'; import API, { APIError } from '../../API'; import SeparatorBase from './SeparatorBase'; import LinkBase from './LinkBase'; @@ -38,6 +39,7 @@ const ScaffoldAuth: FunctionComponent = ({ const dispatch = useDispatch(); const toast = useToast(); const colorScheme = useColorScheme(); + const { t } = useTranslation(); const [logo] = useAssets( colorScheme == 'light' ? require('../../assets/icon_light.png') @@ -84,7 +86,7 @@ const ScaffoldAuth: FunctionComponent = ({ )} { try { handleGuestLogin((accessToken: string) => { @@ -152,7 +154,7 @@ const ScaffoldAuth: FunctionComponent = ({ title={translate('continuewithgoogle')} onPress={() => Linking.openURL(`${API.baseUrl}/auth/login/google`)} /> - or + {t('authOrSection')} - + {index} diff --git a/front/components/leaderboard/PodiumCard.tsx b/front/components/leaderboard/PodiumCard.tsx index 485bdf6..9fe8038 100644 --- a/front/components/leaderboard/PodiumCard.tsx +++ b/front/components/leaderboard/PodiumCard.tsx @@ -62,15 +62,7 @@ export const PodiumCard = ({ - + {userPseudo ?? '---'} - + {userLvl ?? '-'} diff --git a/front/i18n/Translations.ts b/front/i18n/Translations.ts index c926407..3891134 100644 --- a/front/i18n/Translations.ts +++ b/front/i18n/Translations.ts @@ -322,6 +322,7 @@ export const en = { downloadAPKInstructions: "Go to the latest release, unfold the 'Assets' section, and click 'android-build.apk'.", discoverySuggestionSectionTitle: 'Suggested for you', + authOrSection: 'or', }; export const fr: typeof en = { @@ -649,6 +650,7 @@ export const fr: typeof en = { downloadAPKInstructions: "Télécharger 'android-build.apk' dans la section 'Assets' de la dernière release", discoverySuggestionSectionTitle: 'Suggéré pour vous', + authOrSection: 'ou', }; export const sp: typeof en = { @@ -983,4 +985,5 @@ export const sp: typeof en = { downloadAPKInstructions: "Descargue 'android-build.apk' en la sección 'Assets' de la última versión", discoverySuggestionSectionTitle: 'Sugerido para ti', + authOrSection: 'o', }; diff --git a/front/views/LeaderboardView.tsx b/front/views/LeaderboardView.tsx index 132787f..23f4ff1 100644 --- a/front/views/LeaderboardView.tsx +++ b/front/views/LeaderboardView.tsx @@ -29,24 +29,21 @@ const Leaderboardiew = () => { ] as const; return ( - + {translate('leaderBoardHeading')} - + {translate('leaderBoardHeadingFull')}