Compare commits

...

2 commits

Author SHA1 Message Date
Arnaud Vergnet
64e643f5c6 Allow clicking links on Planex title 2020-09-21 19:15:44 +02:00
Arnaud Vergnet
8892095f8a Warn about Amicale vs INSA account 2020-09-21 19:09:53 +02:00
4 changed files with 10 additions and 9 deletions

View file

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

View file

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

View file

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

View file

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