diff --git a/front/components/SearchResult.tsx b/front/components/SearchResult.tsx index 0543526..2489ec8 100644 --- a/front/components/SearchResult.tsx +++ b/front/components/SearchResult.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { VStack, Heading, - Text, Box, Card, Flex, @@ -93,9 +92,7 @@ const SongsSearchComponent = (props: SongsSearchComponentProps) => { return ( - - {translate('songsFilter')} - + {songData?.length ? ( songData.slice(0, props.maxRows).map((comp, index) => ( @@ -132,9 +129,7 @@ const ArtistSearchComponent = (props: ItemSearchComponentProps) => { return ( - - {translate('artistFilter')} - + {artistData?.length ? ( { return ( - - {translate('genreFilter')} - + {genreData?.length ? ( ({ @@ -200,9 +193,7 @@ const FavoritesComponent = () => { return ( - - {translate('songsFilter')} - + {favoritesQuery.data?.map((songData) => ( { return ( {musics.length === 0 ? ( - {translate('menuNoSongsPlayedYet')} + ) : ( musics.map((song) => ( { /> {!isSmallScreen && ( - Chromacase + ChromaCase )} diff --git a/front/i18n/Translations.ts b/front/i18n/Translations.ts index 940f075..fb04d7a 100644 --- a/front/i18n/Translations.ts +++ b/front/i18n/Translations.ts @@ -307,7 +307,13 @@ export const en = { gamesPlayed: 'Games Played', metronome: 'Metronome', loading: "Loading... Please Wait", - emailCheckFailed: 'Email verification failed. The token has expired or is invalid.' + emailCheckFailed: 'Email verification failed. The token has expired or is invalid.', + chromacasePitch: 'Chromacase is a free and open source project that aims to provide a complete learning experience for anyone willing to learn piano.', + whatIsChromacase: 'What is Chromacase?', + clickHereForMoreInfo: 'Click here for more info', + forgotPassword: 'I forgot my password', + updateProfile: 'Update Profile', + accountCreatedOn: 'Account Created on' }; export const fr: typeof en = { @@ -619,7 +625,13 @@ export const fr: typeof en = { gamesPlayed: 'Parties Jouées', metronome: 'Métronome', loading: "Chargement en cours... Veuillez Patienter", - emailCheckFailed: 'Email verification failed. The token has expired or is invalid.' + emailCheckFailed: 'La vérification du mail a échoué', + chromacasePitch: 'ChromaCase est une solution gratuite et opens-source qui cherche à fournir une experience d\'apprentissage complete pour toutes les perosnne qui chercheraient à apprendre le piano.', + whatIsChromacase: 'Chromacase c\'est quoi?', + clickHereForMoreInfo: 'cliquez ici pour plus d\'info', + forgotPassword: 'J\'ai oublié mon mot de passe', + updateProfile: 'Changer le Profile', + accountCreatedOn: 'Compte créé le' }; export const sp: typeof en = { diff --git a/front/views/MusicView.tsx b/front/views/MusicView.tsx index 58cc664..1bb08cd 100644 --- a/front/views/MusicView.tsx +++ b/front/views/MusicView.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Center, Text, useBreakpointValue, useTheme } from 'native-base'; +import { Center, useBreakpointValue, useTheme } from 'native-base'; import { useWindowDimensions } from 'react-native'; import { TabView, @@ -12,7 +12,7 @@ import { import { Heart, Clock, StatusUp, FolderCross } from 'iconsax-react-native'; import { Scene } from 'react-native-tab-view/lib/typescript/src/types'; import { RouteProps, useNavigation } from '../Navigation'; -import { Translate, TranslationKey, translate } from '../i18n/i18n'; +import { Translate, TranslationKey } from '../i18n/i18n'; import ScaffoldCC from '../components/UI/ScaffoldCC'; import MusicList from '../components/UI/MusicList'; import { useQuery } from '../Queries'; @@ -171,9 +171,7 @@ const MusicTab = (props: RouteProps) => { }} renderLabel={({ route, color }) => layout.width > 800 && ( - - {translate(route.title as TranslationKey)} - + ) } tabStyle={{ flexDirection: 'row' }} diff --git a/front/views/PlayView.tsx b/front/views/PlayView.tsx index 30ff45d..5350d02 100644 --- a/front/views/PlayView.tsx +++ b/front/views/PlayView.tsx @@ -380,9 +380,7 @@ const PlayView = ({ songId, route }: RouteProps) => { alignItems: 'center', }} > - - - + ) => { {userQuery.data.name} navigation.navigate('Settings', {})} /> - - Account created on {userQuery.data.data.createdAt.toLocaleDateString()} - + ( + `${e} ${userQuery.data.data.createdAt.toLocaleDateString()}` + )} /> ) => { paddingBottom: 10, }} > - - Your client ID is {userQuery.data.id} - `${userQuery.data.data.gamesPlayed} ${e}`} /> - {`${translate('level')} ${level}`} + `${e} ${level}`} /> { } size={isSmallScreen ? '5xl' : '6xl'} /> - Chromacase + ChromaCase { }} > - What is Chromacase? + - - Chromacase is a free and open source project that aims to provide a complete - learning experience for anyone willing to learn piano. - + { }} > - Click here for more info + @@ -195,7 +191,9 @@ const StartPageView = () => { alignItems: 'center', }} > - I forgot my password + + +