ysimard/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Improved translations

Browse source
This commit is contained in:
keplyx 2019-11-07 17:58:02 +01:00
parent f3d1c705ae
commit 6dfb8e0c38
6 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/DashboardItem.js
View file

@ -8,6 +8,7 @@ import ThemeManager from "../utils/ThemeManager";
import HTML from "react-native-render-html"; import HTML from "react-native-render-html";
import {LinearGradient} from "expo-linear-gradient"; import {LinearGradient} from "expo-linear-gradient";
import PlatformTouchable from "react-native-platform-touchable"; import PlatformTouchable from "react-native-platform-touchable";
import i18n from "i18n-js";
const CARD_BORDER_RADIUS = 10; const CARD_BORDER_RADIUS = 10;
@ -101,12 +102,14 @@ export default class DashboardItem extends React.Component<Props> {
}}/> }}/>
<LinearGradient <LinearGradient
colors={['transparent', ThemeManager.getCurrentThemeVariables().cardDefaultBg]} colors={['transparent', ThemeManager.getCurrentThemeVariables().cardDefaultBg]}
end={[0, 0.6]} start={{x: 0, y: 0}}
end={{x: 0, y: 0.6}}
// end={[0, 0.6]}
style={{ style={{
position: 'absolute', position: 'absolute',
width: '100%', width: '100%',
height: 60, height: 65,
bottom: 0, bottom: -5,
}}> }}>
<View style={{ <View style={{
marginLeft: 'auto', marginLeft: 'auto',
@ -118,7 +121,7 @@ export default class DashboardItem extends React.Component<Props> {
marginBottom: 'auto', marginBottom: 'auto',
padding: 0, padding: 0,
}}> }}>
Click to see more {i18n.t("homeScreen.dashboard.seeMore")}
</Text> </Text>
<CustomMaterialIcon icon={'chevron-right'}/> <CustomMaterialIcon icon={'chevron-right'}/>
</View> </View>

2
components/Sidebar.js
View file

@ -56,7 +56,7 @@ export default class SideBar extends React.Component<Props, State> {
icon: "school", icon: "school",
}, },
{ {
name: "Salles dispo", name: i18n.t('screens.availableRooms'),
route: "AvailableRoomScreen", route: "AvailableRoomScreen",
icon: "calendar-check", icon: "calendar-check",
}, },

4
screens/AvailableRoomScreen.js
View file

@ -1,8 +1,8 @@
// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import ThemeManager from "../utils/ThemeManager";
import WebViewScreen from "../components/WebViewScreen"; import WebViewScreen from "../components/WebViewScreen";
import i18n from "i18n-js";
type Props = { type Props = {
navigation: Object, navigation: Object,
@ -31,7 +31,7 @@ export default class AvailableRoomScreen extends React.Component<Props> {
navigation={nav} navigation={nav}
url={URL} url={URL}
customInjectedJS={this.customInjectedJS} customInjectedJS={this.customInjectedJS}
headerTitle={'SAlles dispo'} headerTitle={i18n.t('screens.availableRooms')}
hasHeaderBackButton={true} hasHeaderBackButton={true}
hasSideMenu={false}/> hasSideMenu={false}/>
); );

6
screens/HomeScreen.js
View file

@ -9,7 +9,7 @@ import FetchedDataSectionList from "../components/FetchedDataSectionList";
import Autolink from 'react-native-autolink'; import Autolink from 'react-native-autolink';
import ThemeManager from "../utils/ThemeManager"; import ThemeManager from "../utils/ThemeManager";
import DashboardItem from "../components/DashboardItem"; import DashboardItem from "../components/DashboardItem";
import DATA from "../dashboard_data.json"; // import DATA from "../dashboard_data.json";
const ICON_AMICALE = require('../assets/amicale.png'); const ICON_AMICALE = require('../assets/amicale.png');
@ -39,7 +39,7 @@ function openWebLink(link) {
export default class HomeScreen extends FetchedDataSectionList { export default class HomeScreen extends FetchedDataSectionList {
constructor() { constructor() {
super('DATA_URL', REFRESH_TIME); super(DATA_URL, REFRESH_TIME);
} }
getHeaderTranslation() { getHeaderTranslation() {
@ -55,7 +55,7 @@ export default class HomeScreen extends FetchedDataSectionList {
} }
createDataset(fetchedData: Object) { createDataset(fetchedData: Object) {
fetchedData = DATA; // fetchedData = DATA;
let newsData = []; let newsData = [];
let dashboardData = []; let dashboardData = [];
if (fetchedData['news_feed'] !== undefined) if (fetchedData['news_feed'] !== undefined)

2
translations/en.json
View file

@ -6,6 +6,7 @@
"proximo": "Proximo", "proximo": "Proximo",
"menuSelf": "RU Menu", "menuSelf": "RU Menu",
"settings": "Settings", "settings": "Settings",
"availableRooms": "Available rooms",
"about": "About", "about": "About",
"debug": "Debug" "debug": "Debug"
}, },
@ -72,6 +73,7 @@
"listUpdateFail": "Error while updating list", "listUpdateFail": "Error while updating list",
"newsFeed": "Campus News", "newsFeed": "Campus News",
"dashboard": { "dashboard": {
"seeMore": "Click to see more",
"todayEventsTitle": "Today's events", "todayEventsTitle": "Today's events",
"todayEventsSubtitleNA": "No events today", "todayEventsSubtitleNA": "No events today",
"todayEventsSubtitle": " event coming today", "todayEventsSubtitle": " event coming today",

2
translations/fr.json
View file

@ -6,6 +6,7 @@
"proximo": "Proximo", "proximo": "Proximo",
"menuSelf": "Menu du RU", "menuSelf": "Menu du RU",
"settings": "Paramètres", "settings": "Paramètres",
"availableRooms": "Salles dispo",
"about": "À Propos", "about": "À Propos",
"debug": "Debug" "debug": "Debug"
}, },
@ -72,6 +73,7 @@
"listUpdateFail": "Erreur lors de la mise à jour de la liste", "listUpdateFail": "Erreur lors de la mise à jour de la liste",
"newsFeed": "Nouvelles du campus", "newsFeed": "Nouvelles du campus",
"dashboard": { "dashboard": {
"seeMore": "Cliquez pour plus d'infos",
"todayEventsTitle": "Événements aujourd'hui", "todayEventsTitle": "Événements aujourd'hui",
"todayEventsSubtitleNA": "Pas d'événements", "todayEventsSubtitleNA": "Pas d'événements",
"todayEventsSubtitle": " événement aujourd'hui", "todayEventsSubtitle": " événement aujourd'hui",