vergnet/application-amicale
5
5
Fork 5
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: vergnet:64e643f5c6b9b0da2d2d12b1070c234f261f7ab5
Branches Tags
vergnet:master
vergnet:functional-migration
vergnet:v5.0.0-3
vergnet:v5.0.0-2
vergnet:4.1.0
vergnet:4.0.1
vergnet:3.0.7
..
compare: vergnet:89c65d70705abf6c1517c303f0fbef373fc6e1b4
Branches Tags
vergnet:master
vergnet:functional-migration
vergnet:v5.0.0-3
vergnet:v5.0.0-2
vergnet:4.1.0
vergnet:4.0.1
vergnet:3.0.7

No commits in common. "64e643f5c6b9b0da2d2d12b1070c234f261f7ab5" and "89c65d70705abf6c1517c303f0fbef373fc6e1b4" have entirely different histories.
64e643f5c6 ... 89c65d7070

4 changed files with 9 additions and 10 deletions
Show stats Expand all files Collapse all files

4
locales/en.json
View file

@ -197,7 +197,7 @@
"login": {
"title": "Login",
"subtitle": "Please enter your AMICALE credentials",
"subtitle": "Please enter your credentials",
"email": "Email",
"emailError": "Please enter a valid email",
"password": "Password",
@ -451,7 +451,7 @@
},
"errors": {
"title": "Error!",
"badCredentials": "Email or password invalid.\n\nMake sure you are using your AMICALE credentials, and not INSA.",
"badCredentials": "Email or password invalid.",
"badToken": "You are not logged in. Please login and try again.",
"noConsent": "You did not give your consent for data processing to the Amicale.",
"tokenSave": "Could not save session token. Please contact support.",

4
locales/fr.json
View file

@ -197,7 +197,7 @@
"login": {
"title": "Connexion",
"subtitle": "Entre tes identifiants AMICALE",
"subtitle": "Entre tes identifiants",
"email": "Email",
"emailError": "Merci d'entrer un email valide",
"password": "Mot de passe",
@ -451,7 +451,7 @@
},
"errors": {
"title": "Erreur !",
"badCredentials": "Email ou mot de passe invalide.\n\nVérifie que tu utilises bien tes identifiants AMICALE et non pas INSA.",
"badCredentials": "Email ou mot de passe invalide.",
"badToken": "Tu n'est pas connecté. Merci de te connecter puis réessayes.",
"noConsent": "Tu n'as pas donné ton consentement pour l'utilisation de tes données personnelles.",
"tokenSave": "Impossible de sauvegarder le token de session. Merci de contacter le support.",

4
src/components/Dialogs/AlertDialog.js
View file

@ -26,8 +26,8 @@ import i18n from 'i18n-js';
type PropsType = {
visible: boolean,
onDismiss: () => void,
title: string | React.Node,
message: string | React.Node,
title: string,
message: string,
};
class AlertDialog extends React.PureComponent<PropsType> {

7
src/screens/Planex/PlanexScreen.js
View file

@ -20,12 +20,11 @@
// @flow
import * as React from 'react';
import {Title, withTheme} from 'react-native-paper';
import {withTheme} from 'react-native-paper';
import i18n from 'i18n-js';
import {View} from 'react-native';
import {CommonActions} from '@react-navigation/native';
import {StackNavigationProp} from '@react-navigation/stack';
import Autolink from 'react-native-autolink';
import type {CustomThemeType} from '../../managers/ThemeManager';
import ThemeManager from '../../managers/ThemeManager';
import WebViewScreen from '../../components/Screens/WebViewScreen';
@ -47,7 +46,7 @@ type PropsType = {
type StateType = {
dialogVisible: boolean,
dialogTitle: string | React.Node,
dialogTitle: string,
dialogMessage: string,
currentGroup: PlanexGroupType,
};
@ -286,7 +285,7 @@ class PlanexScreen extends React.Component<PropsType, StateType> {
showDialog = (title: string, message: string) => {
this.setState({
dialogVisible: true,
dialogTitle: <Autolink text={title} component={Title}/>,
dialogTitle: title,
dialogMessage: message,
});
};