Revert "added language"

This reverts commit 6ef6764a48.
This commit is contained in:
emilyliublair 2021-07-13 23:57:19 -04:00
parent 6ef6764a48
commit 388fcff001
15 changed files with 1501 additions and 1602 deletions

View File

@ -27,17 +27,17 @@ import Staff from './Staff'
import OpeningPage from './OpeningPage'; import OpeningPage from './OpeningPage';
import OpenPage from './OpenPage'; import OpenPage from './OpenPage';
import Ionicons from 'react-native-vector-icons/Ionicons'; import Ionicons from 'react-native-vector-icons/Ionicons';
import I18n from './i18n'; //import I18n from './i18n';
import AsyncStorage from '@react-native-community/async-storage' import AsyncStorage from '@react-native-community/async-storage'
const Tab = createBottomTabNavigator(); const Tab = createBottomTabNavigator();
AsyncStorage.getItem('language') /*AsyncStorage.getItem('language')
.then((token) => { .then((token) => {
console.log("lang: " + token); console.log("lang: " + token);
I18n.locale = token; I18n.locale = token;
}); });
*/
AsyncStorage.getItem('announcementNotifs') AsyncStorage.getItem('announcementNotifs')
.then((token) => { .then((token) => {
console.log("announcementNotifs: " + token); console.log("announcementNotifs: " + token);
@ -86,11 +86,11 @@ class App extends React.Component {
fontSize:16 fontSize:16
}}} }}}
> >
<Tab.Screen name={I18n.t('app.home')} component={Home}/> <Tab.Screen name="Home" component={Home}/>
<Tab.Screen name={I18n.t('app.calendar')} component={Calendar}/> <Tab.Screen name="Calendar" component={Calendar}/>
<Tab.Screen name={I18n.t('app.clubs')} component={Clubs}/> <Tab.Screen name="Clubs" component={Clubs}/>
<Tab.Screen name={I18n.t('app.staff')} component={Staff}/> <Tab.Screen name="Staff" component={Staff}/>
<Tab.Screen name={I18n.t('app.more')} component={More}/> <Tab.Screen name="More" component={More}/>
</Tab.Navigator> </Tab.Navigator>
: <OpenPage />} : <OpenPage />}
</NavigationContainer> </NavigationContainer>

View File

@ -173,7 +173,7 @@ import {
} from 'react-native/Libraries/NewAppScreen'; } from 'react-native/Libraries/NewAppScreen';
import LinearGradient from 'react-native-linear-gradient'; import LinearGradient from 'react-native-linear-gradient';
import I18n from './i18n';
import styles from './styles/liststyles' import styles from './styles/liststyles'
import { url } from './resources/fetchInfo.json' import { url } from './resources/fetchInfo.json'
@ -282,7 +282,7 @@ class Calendar extends React.Component {
colors={['#f99', 'white']} colors={['#f99', 'white']}
style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}} style = {{height: '100%', borderBottomColor:'black', borderBottomWidth:0.5, display: 'flex', justifyContent: 'flex-end', paddingBottom: '2.5%'}}
> >
<Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>{I18n.t('calendar.calendarEvents')}</Text> <Text style = {{fontSize: 24, fontWeight: 'bold', alignSelf: 'center'}}>Calendar Events</Text>
</LinearGradient> </LinearGradient>
</View> </View>

View File

@ -160,7 +160,7 @@ class Clubs extends React.Component {
<SafeAreaView style={styles.container}> <SafeAreaView style={styles.container}>
<SearchBar <SearchBar
lightTheme lightTheme
placeholder={I18n.t('clubs.searchClubs')} placeholder={'Search Clubs'}
onChangeText={this.updateSearch} onChangeText={this.updateSearch}
onCancel={this.clearSearch} onCancel={this.clearSearch}
onClear={this.clearSearch} onClear={this.clearSearch}

View File

@ -31,7 +31,7 @@ import { NavigationContainer } from '@react-navigation/native'
import { createStackNavigator } from '@react-navigation/stack' import { createStackNavigator } from '@react-navigation/stack'
import Announcements from './Announcements' import Announcements from './Announcements'
import AsyncStorage from '@react-native-community/async-storage' import AsyncStorage from '@react-native-community/async-storage'
import I18n from './i18n'; //import I18n from './i18n';
const getCurrentDate=()=>{ const getCurrentDate=()=>{
@ -261,7 +261,7 @@ const New = ({item}) => {
} }
function Home1() { function Home1() {
const [modalVisible, setModalVisible] = useState(true); const [modalVisible, setModalVisible] = useState(false);
return ( return (
<View> <View>
@ -350,9 +350,9 @@ function HomeScreen (props) {
<ScrollView style={{height: '100%', backgroundColor: 'white'}}> <ScrollView style={{height: '100%', backgroundColor: 'white'}}>
<View style={{height: 275, backgroundColor: 'white', padding: '2%'}}> <View style={{height: 275, backgroundColor: 'white', padding: '2%'}}>
<View style={{display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', marginBottom: '2%'}}> <View style={{display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', marginBottom: '2%'}}>
<Text style={liststyles.homeTitle}>{I18n.t('home.whatsNew')}</Text> <Text style={liststyles.homeTitle}>Whats New</Text>
<TouchableOpacity onPress={()=>props.navigation.navigate('new', {data:props.data})}> <TouchableOpacity onPress={()=>props.navigation.navigate('new', {data:props.data})}>
<Text style={{color: 'blue', textDecorationLine: 'underline'}}>{I18n.t('home.viewAll')}</Text> <Text style={{color: 'blue', textDecorationLine: 'underline'}}>View All</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<ScrollView horizontal='true' style={{display: 'flex', flexDirection: 'row', paddingHorizontal: '2%'}}></ScrollView> <ScrollView horizontal='true' style={{display: 'flex', flexDirection: 'row', paddingHorizontal: '2%'}}></ScrollView>
@ -368,7 +368,7 @@ function HomeScreen (props) {
</View> </View>
<View style={{height: 275, backgroundColor: 'white', padding: '2%'}}> <View style={{height: 275, backgroundColor: 'white', padding: '2%'}}>
<Text style={liststyles.homeTitle}>{I18n.t('home.SOTW')}</Text> <Text style={liststyles.homeTitle}>Student of the Week</Text>
<View style={{display: 'flex', flexDirection: 'row', paddingTop: '5%', paddingHorizontal: '2%', justifyContent: 'space-between'}}> <View style={{display: 'flex', flexDirection: 'row', paddingTop: '5%', paddingHorizontal: '2%', justifyContent: 'space-between'}}>
<View style={{display: 'flex', borderWidth: 1, borderColor: 'black', borderRadius: 8, width: '32%', height: '100%'}}> <View style={{display: 'flex', borderWidth: 1, borderColor: 'black', borderRadius: 8, width: '32%', height: '100%'}}>
<View style={{height:'70%'}}> <View style={{height:'70%'}}>
@ -376,22 +376,22 @@ function HomeScreen (props) {
</View> </View>
<View style ={{paddingHorizontal: '2%', height: '15%', borderTopWidth: 1}}> <View style ={{paddingHorizontal: '2%', height: '15%', borderTopWidth: 1}}>
<Text style={{fontWeight: 'bold', fontSize: 18}}>{props.studentData.name}</Text> <Text style={{fontWeight: 'bold', fontSize: 18}}>{props.studentData.name}</Text>
<Text>{I18n.t('home.Grade')} {props.studentData.year}</Text> <Text>Grade {props.studentData.year}</Text>
</View> </View>
</View> </View>
<View style={{borderWidth: 1, borderColor: 'black', borderRadius: 8, width: '64%', height: '100%', padding: '2%'}}> <View style={{borderWidth: 1, borderColor: 'black', borderRadius: 8, width: '64%', height: '100%', padding: '2%'}}>
<Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>{I18n.t('home.Hobbies')} </Text>{props.studentData.hobbies}</Text> <Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>Hobbies: </Text>{props.studentData.hobbies}</Text>
<Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>{I18n.t('home.Achievements')} </Text>{props.studentData.achievements}</Text> <Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>Achievements: </Text>{props.studentData.achievements}</Text>
<Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>{I18n.t('home.Messages')} </Text>{props.studentData.messages}</Text> <Text style={{fontSize: 16}}><Text style={{fontWeight: 'bold'}}>Messages: </Text>{props.studentData.messages}</Text>
</View> </View>
</View> </View>
</View> </View>
<View style={{padding: '2%'}}> <View style={{padding: '2%'}}>
<View style ={{display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', marginBottom: '2%'}}> <View style ={{display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', marginBottom: '2%'}}>
<Text style={liststyles.homeTitle}>{I18n.t('home.Announcements')}</Text> <Text style={liststyles.homeTitle}>Announcements</Text>
<TouchableOpacity onPress={()=>props.navigation.navigate(Announcements)}> <TouchableOpacity onPress={()=>props.navigation.navigate(Announcements)}>
<Text style={{color: 'blue', textDecorationLine: 'underline'}}>{I18n.t('home.viewAll')}</Text> <Text style={{color: 'blue', textDecorationLine: 'underline'}}>View All</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<FlatList <FlatList

View File

@ -1,4 +1,4 @@
import React, { Component } from 'react'; /*import React, { Component } from 'react';
import { DevSettings } from 'react-native'; import { DevSettings } from 'react-native';
import { Platform, StyleSheet, TouchableOpacity, Text, ScrollView, View } from 'react-native'; import { Platform, StyleSheet, TouchableOpacity, Text, ScrollView, View } from 'react-native';
import I18n from './i18n'; import I18n from './i18n';
@ -55,7 +55,6 @@ export default class extends Component {
render() { render() {
return ( return (
<View style={{flex: 1, backgroundColor: 'white', padding: 24}}> <View style={{flex: 1, backgroundColor: 'white', padding: 24}}>
<Text style ={{marginBottom: 5}}>{I18n.t('language.note')}</Text> <Text style ={{marginBottom: 5}}>{I18n.t('language.note')}</Text>
<View> <View>
@ -72,4 +71,4 @@ export default class extends Component {
</View> </View>
); );
} }
} }*/

View File

@ -33,7 +33,7 @@ import Settings from './Settings'
import Poll from './Poll' import Poll from './Poll'
import Images from './Images' import Images from './Images'
import LinearGradient from 'react-native-linear-gradient' import LinearGradient from 'react-native-linear-gradient'
import I18n from './i18n'; //import I18n from './i18n';
const Stack = createStackNavigator() const Stack = createStackNavigator()
@ -51,8 +51,8 @@ class MoreSwitch extends React.Component {
{name:'Announcements',key:"announce", img:Images.announcements}, {name:'Announcements',key:"announce", img:Images.announcements},
{name:"Resources",key:"resources", img:Images.resources}, {name:"Resources",key:"resources", img:Images.resources},
{name:"SOTW",key:"studentweek", img:Images.student}, {name:"SOTW",key:"studentweek", img:Images.student},
{name:"lunch",key:"lunchevent", img:Images.lunch}, {name:"Lunch",key:"lunchevent", img:Images.lunch},
{name:"ssl",key:"sslopps", img:Images.sslopps}, {name:"SSL",key:"sslopps", img:Images.sslopps},
{name:"COTW",key:"challengeweek", img:Images.challenge}, {name:"COTW",key:"challengeweek", img:Images.challenge},
{name:"Polls", key:"polls", img: Images.polls}, {name:"Polls", key:"polls", img: Images.polls},
{name:"Settings", key:"settings", img: Images.settings}, {name:"Settings", key:"settings", img: Images.settings},
@ -61,7 +61,7 @@ class MoreSwitch extends React.Component {
<TouchableOpacity style={styles.moreitem} onPress={()=>this.props.navigation.navigate(item.key)}> <TouchableOpacity style={styles.moreitem} onPress={()=>this.props.navigation.navigate(item.key)}>
<Image source = {item.img} style = {{height: 40, width: 40, marginRight: 10, tintColor: '#e3e3e3'}}/> <Image source = {item.img} style = {{height: 40, width: 40, marginRight: 10, tintColor: '#e3e3e3'}}/>
<Text style={styles.moretext}>{I18n.t('more.'+item.name)}</Text> <Text style={styles.moretext}>{item.name}</Text>
</TouchableOpacity> </TouchableOpacity>
} }
/> />
@ -84,7 +84,7 @@ class More extends React.Component {
name="Chooser" name="Chooser"
component={MoreSwitch} component={MoreSwitch}
options={{ options={{
title:I18n.t('more.More'), title:"More",
headerTitleStyle:styles.headerTitle, headerTitleStyle:styles.headerTitle,
headerBackground: ()=>background headerBackground: ()=>background
}} }}
@ -93,7 +93,7 @@ class More extends React.Component {
name="announce" name="announce"
component={Announcements} component={Announcements}
options={{ options={{
title:I18n.t('more.Announcements'), title:"Announcements",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -103,7 +103,7 @@ class More extends React.Component {
name="resources" name="resources"
component={Resources} component={Resources}
options={{ options={{
title:I18n.t('more.Resources'), title:"Resources",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -113,7 +113,7 @@ class More extends React.Component {
name="studentweek" name="studentweek"
component={StudentWeek} component={StudentWeek}
options={{ options={{
title:I18n.t('more.SOTW'), title:"Student of the Week",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -123,7 +123,7 @@ class More extends React.Component {
name="lunchevent" name="lunchevent"
component={LunchEvents} component={LunchEvents}
options={{ options={{
title:I18n.t('more.lunch'), title:"Lunch",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -133,7 +133,7 @@ class More extends React.Component {
name="sslopps" name="sslopps"
component={SSLOps} component={SSLOps}
options={{ options={{
title:I18n.t('more.ssl'), title:"SSL Ops",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -143,7 +143,7 @@ class More extends React.Component {
name="challengeweek" name="challengeweek"
component={ChallengeWeek} component={ChallengeWeek}
options={{ options={{
title:I18n.t('more.COTW'), title:"Challenge of the Week",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -153,7 +153,7 @@ class More extends React.Component {
name="polls" name="polls"
component={Poll} component={Poll}
options={{ options={{
title:I18n.t('more.Polls'), title:"Polls",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
@ -163,11 +163,10 @@ class More extends React.Component {
name="settings" name="settings"
component={Settings} component={Settings}
options={{ options={{
title:I18n.t('more.Settings'), title:"Settings",
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background, headerBackground: ()=>background
headerShown:false
}} }}
/> />
<Stack.Screen <Stack.Screen

View File

@ -1,4 +1,4 @@
import React, { Component, useState } from 'react'; /*import React, { Component, useState } from 'react';
import { import {
Platform, Platform,
StyleSheet, StyleSheet,
@ -110,17 +110,13 @@ class Notifications extends Component {
render() { render() {
return ( return (
<View>
<Text> <View style = {{flex: 1, backgroundColor: 'white', padding: 20}}>
Notifs
</Text>
</View>
/*<View style = {{flex: 1, backgroundColor: 'white', padding: 20}}>
<AnnouncementNotifs /> <AnnouncementNotifs />
<EventNotifs /> <EventNotifs />
</View>*/ </View>
); );
} }
} }
export default Notifications export default Notifications*/

View File

@ -26,9 +26,9 @@ import LinearGradient from 'react-native-linear-gradient'
import Images from './Images' import Images from './Images'
import { NavigationContainer } from '@react-navigation/native' import { NavigationContainer } from '@react-navigation/native'
import { createStackNavigator } from '@react-navigation/stack' import { createStackNavigator } from '@react-navigation/stack'
import I18n from './i18n'; //import I18n from './i18n';
import Language from './Language' //import Language from './Language'
import Notifications from './Notifications' //import Notifications from './Notifications'
const Stack = createStackNavigator() const Stack = createStackNavigator()
@ -50,7 +50,7 @@ class placeHoldingForNow extends React.Component{
) )
} }
} }
class SettingSwitch extends React.Component { /*class SettingSwitch extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.props = props this.props = props
@ -61,15 +61,12 @@ class SettingSwitch extends React.Component {
<View style={{flex:1,backgroundColor:'red'}}> <View style={{flex:1,backgroundColor:'red'}}>
<FlatList <FlatList
data={[ data={[
{name:"Language",key:"language", img:Images.lang},
//{name:"Notifications",key:"notifications", img:Images.notifs},
//{name:"Language",key:"language", img:Images.lang} //{name:"Language",key:"language", img:Images.lang}
//{name:"Notifications",key:"notifications", img:Images.notifs},\ //{name:"Notifications",key:"notifications", img:Images.notifs},
]} ]}
renderItem={({item})=> renderItem={({item})=>
<TouchableOpacity style={styles.moreitem} onPress={()=>this.props.navigation.navigate(item.key)}> <TouchableOpacity style={styles.moreitem} onPress={()=>this.props.navigation.navigate(item.key)}>
<Image source = {item.img} style = {{height: 40, width: 40, marginRight: 10, tintColor: '#e3e3e3'}}/> <Image source = {item.img} style = {{height: 40, width: 40, marginRight: 10, tintColor: '#e3e3e3'}}/>
<Text style={styles.moretext}>{I18n.t('settings.' + item.key)}</Text> <Text style={styles.moretext}>{I18n.t('settings.' + item.key)}</Text>
</TouchableOpacity> </TouchableOpacity>
} }
@ -78,7 +75,7 @@ class SettingSwitch extends React.Component {
) )
} }
} }
*/
const background = (<LinearGradient const background = (<LinearGradient
colors={['#f99', 'white']} colors={['#f99', 'white']}
style = {{flex:1,borderBottomColor:'black',borderBottomWidth:0.5}} style = {{flex:1,borderBottomColor:'black',borderBottomWidth:0.5}}
@ -87,35 +84,44 @@ const background = (<LinearGradient
class Settings extends React.Component { class Settings extends React.Component {
render() { render() {
return ( return (
/*<View style={{flex:1,backgroundColor:'red'}}> <View style={{flex:1,backgroundColor:'red'}}>
<Text> <Text>
Coming Soon... Coming Soon...
</Text> </Text>
</View>*/ </View>
<NavigationContainer independent={true}> /*<NavigationContainer independent={true}>
<Stack.Navigator> <Stack.Navigator>
<Stack.Screen <Stack.Screen
name="Chooser" name="Chooser"
component={SettingSwitch} component={placeHoldingForNow}
options={{ options={{
title:I18n.t('more.Settings'), title:'Settings',
headerTitleStyle:styles.headerTitle, headerTitleStyle:styles.headerTitle,
headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
}} }}
/> />
{<Stack.Screen {/*<Stack.Screen
name="language" name="language"
component={Language} component={Language}
options={{ options={{
title:I18n.t('settings.language'), title:'Language',
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null,
headerBackground: ()=>background
}}
/>}*/
/*{<Stack.Screen
name="notifications"
component={Notifications}
options={{
title:'Notifications',
headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}], headerTitleStyle:[styles.headerTitle,{alignSelf:'center'}],
headerLeft:null, headerLeft:null,
headerBackground: ()=>background headerBackground: ()=>background
}} }}
/>} />}
</Stack.Navigator> </Stack.Navigator>
</NavigationContainer> </NavigationContainer>*/
) )
} }
} }

View File

@ -23,7 +23,7 @@ import {
import { SearchBar } from 'react-native-elements'; import { SearchBar } from 'react-native-elements';
import styles from './styles/liststyles' import styles from './styles/liststyles'
import { url } from './resources/fetchInfo.json' import { url } from './resources/fetchInfo.json'
import I18n from './i18n'; //import I18n from './i18n';
const StaffElement = ({item}) => { const StaffElement = ({item}) => {
const [visible, setVisible] = useState(false) const [visible, setVisible] = useState(false)
@ -108,7 +108,7 @@ class Staff extends React.Component {
<SafeAreaView style={styles.container}> <SafeAreaView style={styles.container}>
<SearchBar <SearchBar
lightTheme lightTheme
placeholder={I18n.t('staff.searchStaff')} placeholder="Staff Search"
onChangeText={this.updateSearch} onChangeText={this.updateSearch}
onCancel={this.clearSearch} onCancel={this.clearSearch}
onClear={this.clearSearch} onClear={this.clearSearch}

View File

@ -16,7 +16,7 @@ import {
DebugInstructions, DebugInstructions,
ReloadInstructions, ReloadInstructions,
} from 'react-native/Libraries/NewAppScreen'; } from 'react-native/Libraries/NewAppScreen';
import I18n from './i18n'; //import I18n from './i18n';
import { url } from './resources/fetchInfo.json' import { url } from './resources/fetchInfo.json'
class StudentWeek extends React.Component { class StudentWeek extends React.Component {
@ -49,7 +49,7 @@ class StudentWeek extends React.Component {
<View style = {{display: 'flex', flexDirection: 'row', justifyContent: 'space-between'}}> <View style = {{display: 'flex', flexDirection: 'row', justifyContent: 'space-between'}}>
<View> <View>
<Text style={{fontSize:28,marginBottom:'10%',textAlign:'center'}}>{this.state.data.name}</Text> <Text style={{fontSize:28,marginBottom:'10%',textAlign:'center'}}>{this.state.data.name}</Text>
<Text style={{fontSize:20}}>{'\t'}{I18n.t('student.Grade')} {this.state.data.year}</Text> <Text style={{fontSize:20}}>{'\t'}Grade: {this.state.data.year}</Text>
</View> </View>
<View style = {{height: 150, width: 150}}> <View style = {{height: 150, width: 150}}>
<Image style = {{height: '100%', width:'100%', borderRadius: 6}}source={{iconURI}} /> <Image style = {{height: '100%', width:'100%', borderRadius: 6}}source={{iconURI}} />
@ -59,15 +59,15 @@ class StudentWeek extends React.Component {
<View style = {{paddingTop:'10%', height: '55%', display: 'flex', flexDirection: 'column', justifyContent: 'space-between'}}> <View style = {{paddingTop:'10%', height: '55%', display: 'flex', flexDirection: 'column', justifyContent: 'space-between'}}>
<View> <View>
<Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}{I18n.t('student.Hobbies')}</Text> <Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}Hobbies:</Text>
<Text style={{fontSize: 20}}>{'\t'}{this.state.data.hobbies}</Text> <Text style={{fontSize: 20}}>{'\t'}{this.state.data.hobbies}</Text>
</View> </View>
<View> <View>
<Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}{I18n.t('student.Achievements')} </Text> <Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}Achievements: </Text>
<Text style={{fontSize: 20}}>{'\t'}{this.state.data.achievements}</Text> <Text style={{fontSize: 20}}>{'\t'}{this.state.data.achievements}</Text>
</View> </View>
<View> <View>
<Text style={{fontSize: 20, fontWeight: 'bold'}}>{I18n.t('student.Messages')}</Text> <Text style={{fontSize: 20, fontWeight: 'bold'}}>{"\n"}Messages:</Text>
<Text style={{fontSize: 20}}>{'\t'}{this.state.data.messages}</Text> <Text style={{fontSize: 20}}>{'\t'}{this.state.data.messages}</Text>
</View> </View>
</View> </View>

View File

@ -1,12 +1,12 @@
'use strict'; //'use strict';
import I18n from 'react-native-i18n'; //import I18n from 'react-native-i18n';
import en from './Languages/en' //import en from './Languages/en'
import es from './Languages/es' //import es from './Languages/es'
I18n.fallbacks = true; //I18n.fallbacks = true;
I18n.translations = { //I18n.translations = {
en, //en,
es, //es,
}; //};
export default I18n; //export default I18n;

View File

@ -319,10 +319,6 @@ PODS:
- React - React
- RNGestureHandler (1.10.3): - RNGestureHandler (1.10.3):
- React-Core - React-Core
- RNI18n (2.0.15):
- React
- RNLocalize (2.1.1):
- React-Core
- RNScreens (3.4.0): - RNScreens (3.4.0):
- React-Core - React-Core
- React-RCTImage - React-RCTImage
@ -386,8 +382,6 @@ DEPENDENCIES:
- "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)" - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
- "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
- RNI18n (from `../node_modules/react-native-i18n`)
- RNLocalize (from `../node_modules/react-native-localize`)
- RNScreens (from `../node_modules/react-native-screens`) - RNScreens (from `../node_modules/react-native-screens`)
- RNVectorIcons (from `../node_modules/react-native-vector-icons`) - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
@ -472,10 +466,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/@react-native-community/masked-view" :path: "../node_modules/@react-native-community/masked-view"
RNGestureHandler: RNGestureHandler:
:path: "../node_modules/react-native-gesture-handler" :path: "../node_modules/react-native-gesture-handler"
RNI18n:
:path: "../node_modules/react-native-i18n"
RNLocalize:
:path: "../node_modules/react-native-localize"
RNScreens: RNScreens:
:path: "../node_modules/react-native-screens" :path: "../node_modules/react-native-screens"
RNVectorIcons: RNVectorIcons:
@ -527,8 +517,6 @@ SPEC CHECKSUMS:
RNCAsyncStorage: dfcd17ecff5403061bc649ee33ee751718870c8a RNCAsyncStorage: dfcd17ecff5403061bc649ee33ee751718870c8a
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
RNI18n: e2f7e76389fcc6e84f2c8733ea89b92502351fd8
RNLocalize: 82a569022724d35461e2dc5b5d015a13c3ca995b
RNScreens: 21b73c94c9117e1110a79ee0ee80c93ccefed8ce RNScreens: 21b73c94c9117e1110a79ee0ee80c93ccefed8ce
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6

80
package-lock.json generated
View File

@ -15,16 +15,13 @@
"@react-navigation/stack": "^5.9.0", "@react-navigation/stack": "^5.9.0",
"@vitalets/google-translate-api": "^4.0.0", "@vitalets/google-translate-api": "^4.0.0",
"events": "^3.2.0", "events": "^3.2.0",
"i18next": "^20.3.2",
"querystring": "^0.2.0", "querystring": "^0.2.0",
"react": "16.13.1", "react": "16.13.1",
"react-native": "^0.63.2", "react-native": "^0.63.2",
"react-native-elements": "^2.2.0", "react-native-elements": "^2.2.0",
"react-native-gesture-handler": "^1.10.3", "react-native-gesture-handler": "^1.10.3",
"react-native-i18n": "^2.0.15",
"react-native-linear-gradient": "^2.5.6", "react-native-linear-gradient": "^2.5.6",
"react-native-locale-detector": "^1.0.1", "react-native-locale-detector": "^1.0.1",
"react-native-localize": "^2.1.1",
"react-native-safe-area-context": "^3.2.0", "react-native-safe-area-context": "^3.2.0",
"react-native-screens": "^3.4.0", "react-native-screens": "^3.4.0",
"react-native-splash-screen": "^3.2.0", "react-native-splash-screen": "^3.2.0",
@ -7075,30 +7072,6 @@
"node": ">=8.12.0" "node": ">=8.12.0"
} }
}, },
"node_modules/i18n-js": {
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-3.0.11.tgz",
"integrity": "sha512-v7dG3kYJTQTyox3NqDabPDE/ZotWntyMI9kh4cYi+XlCSnsIR+KBTS2opPyObL8WndnklcLzbNU92FP/mLge3Q=="
},
"node_modules/i18next": {
"version": "20.3.2",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-20.3.2.tgz",
"integrity": "sha512-e8CML2R9Ng2sSQOM80wb/PrM2j8mDm84o/T4Amzn9ArVyNX5/ENWxxAXkRpZdTQNDaxKImF93Wep4mAoozFrKw==",
"dependencies": {
"@babel/runtime": "^7.12.0"
}
},
"node_modules/i18next/node_modules/@babel/runtime": {
"version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
"integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
"dependencies": {
"regenerator-runtime": "^0.13.4"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/iconv-lite": { "node_modules/iconv-lite": {
"version": "0.4.24", "version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@ -12545,14 +12518,6 @@
"asap": "~2.0.3" "asap": "~2.0.3"
} }
}, },
"node_modules/react-native-i18n": {
"version": "2.0.15",
"resolved": "https://registry.npmjs.org/react-native-i18n/-/react-native-i18n-2.0.15.tgz",
"integrity": "sha512-V8VwUP0TLda3oJvgt5tdnFaOV7WXPhTjCTLO7sXI3C2SHggSbD4bCUryMzNJhesimJidH21V2Owvj4zAylHoQQ==",
"dependencies": {
"i18n-js": "3.0.11"
}
},
"node_modules/react-native-iphone-x-helper": { "node_modules/react-native-iphone-x-helper": {
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
@ -12574,14 +12539,6 @@
"resolved": "https://registry.npmjs.org/react-native-locale-detector/-/react-native-locale-detector-1.0.1.tgz", "resolved": "https://registry.npmjs.org/react-native-locale-detector/-/react-native-locale-detector-1.0.1.tgz",
"integrity": "sha1-wAImHstgYZ5ZUiV8jH+jHCwV7TA=" "integrity": "sha1-wAImHstgYZ5ZUiV8jH+jHCwV7TA="
}, },
"node_modules/react-native-localize": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/react-native-localize/-/react-native-localize-2.1.1.tgz",
"integrity": "sha512-+uyz2/b0vyLq19fcb7r1qU1gqmzbp3aC6EMTvOVXwfBuiN+aJXR/fDdFOJJ8D7+bLccKeuS2zBDrazh+ZayX/g==",
"peerDependencies": {
"react-native": ">=0.60.0"
}
},
"node_modules/react-native-ratings": { "node_modules/react-native-ratings": {
"version": "7.6.1", "version": "7.6.1",
"resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-7.6.1.tgz", "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-7.6.1.tgz",
@ -20847,29 +20804,6 @@
"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
"dev": true "dev": true
}, },
"i18n-js": {
"version": "3.0.11",
"resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-3.0.11.tgz",
"integrity": "sha512-v7dG3kYJTQTyox3NqDabPDE/ZotWntyMI9kh4cYi+XlCSnsIR+KBTS2opPyObL8WndnklcLzbNU92FP/mLge3Q=="
},
"i18next": {
"version": "20.3.2",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-20.3.2.tgz",
"integrity": "sha512-e8CML2R9Ng2sSQOM80wb/PrM2j8mDm84o/T4Amzn9ArVyNX5/ENWxxAXkRpZdTQNDaxKImF93Wep4mAoozFrKw==",
"requires": {
"@babel/runtime": "^7.12.0"
},
"dependencies": {
"@babel/runtime": {
"version": "7.14.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
"integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
}
}
},
"iconv-lite": { "iconv-lite": {
"version": "0.4.24", "version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@ -25164,14 +25098,6 @@
} }
} }
}, },
"react-native-i18n": {
"version": "2.0.15",
"resolved": "https://registry.npmjs.org/react-native-i18n/-/react-native-i18n-2.0.15.tgz",
"integrity": "sha512-V8VwUP0TLda3oJvgt5tdnFaOV7WXPhTjCTLO7sXI3C2SHggSbD4bCUryMzNJhesimJidH21V2Owvj4zAylHoQQ==",
"requires": {
"i18n-js": "3.0.11"
}
},
"react-native-iphone-x-helper": { "react-native-iphone-x-helper": {
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
@ -25189,12 +25115,6 @@
"resolved": "https://registry.npmjs.org/react-native-locale-detector/-/react-native-locale-detector-1.0.1.tgz", "resolved": "https://registry.npmjs.org/react-native-locale-detector/-/react-native-locale-detector-1.0.1.tgz",
"integrity": "sha1-wAImHstgYZ5ZUiV8jH+jHCwV7TA=" "integrity": "sha1-wAImHstgYZ5ZUiV8jH+jHCwV7TA="
}, },
"react-native-localize": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/react-native-localize/-/react-native-localize-2.1.1.tgz",
"integrity": "sha512-+uyz2/b0vyLq19fcb7r1qU1gqmzbp3aC6EMTvOVXwfBuiN+aJXR/fDdFOJJ8D7+bLccKeuS2zBDrazh+ZayX/g==",
"requires": {}
},
"react-native-ratings": { "react-native-ratings": {
"version": "7.6.1", "version": "7.6.1",
"resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-7.6.1.tgz", "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-7.6.1.tgz",

View File

@ -18,16 +18,13 @@
"@react-navigation/stack": "^5.9.0", "@react-navigation/stack": "^5.9.0",
"@vitalets/google-translate-api": "^4.0.0", "@vitalets/google-translate-api": "^4.0.0",
"events": "^3.2.0", "events": "^3.2.0",
"i18next": "^20.3.2",
"querystring": "^0.2.0", "querystring": "^0.2.0",
"react": "16.13.1", "react": "16.13.1",
"react-native": "^0.63.2", "react-native": "^0.63.2",
"react-native-elements": "^2.2.0", "react-native-elements": "^2.2.0",
"react-native-gesture-handler": "^1.10.3", "react-native-gesture-handler": "^1.10.3",
"react-native-i18n": "^2.0.15",
"react-native-linear-gradient": "^2.5.6", "react-native-linear-gradient": "^2.5.6",
"react-native-locale-detector": "^1.0.1", "react-native-locale-detector": "^1.0.1",
"react-native-localize": "^2.1.1",
"react-native-safe-area-context": "^3.2.0", "react-native-safe-area-context": "^3.2.0",
"react-native-screens": "^3.4.0", "react-native-screens": "^3.4.0",
"react-native-splash-screen": "^3.2.0", "react-native-splash-screen": "^3.2.0",

2840
yarn.lock

File diff suppressed because it is too large Load Diff