all repos — caroster @ 77927f1b1b32d25b9e0eff2b035da214e0cb4a3d

[Octree] Group carpool to your event https://caroster.io

feat:✨ Clarify optional email
Simon Mulquin simon@octree.ch
Fri, 20 May 2022 07:29:22 +0000
commit

77927f1b1b32d25b9e0eff2b035da214e0cb4a3d

parent

f32c91bc409d3d049b4e8f1c465b5fa6e738ee46

M frontend/containers/NewPassengerDialog/AddPassengerCommonFields.tsxfrontend/containers/NewPassengerDialog/AddPassengerCommonFields.tsx

@@ -11,12 +11,23 @@ name: string;

setName: (name: string) => void; email: string; emailError: boolean; + optionalEmail?: boolean; setEmail: (email: string) => void; } -const AddPassengerCommonFields = ({name, setName, email, emailError, setEmail}: Props) => { +const AddPassengerCommonFields = ({ + name, + setName, + email, + emailError, + setEmail, + optionalEmail, +}: Props) => { const {t} = useTranslation(); const classes = useStyles(); + const emailPlaceholder = t( + `travel.passengers.email_placeholder${optionalEmail ? '_optional' : ''}` + ); return ( <Fragment>

@@ -57,7 +68,7 @@ fullWidth

label="" error={email && emailError} helperText={email && t('travel.passengers.email_helpertext')} - placeholder={t('travel.passengers.email_placeholder')} + placeholder={emailPlaceholder} /> </Box> </Fragment>
M frontend/containers/NewPassengerDialog/AddPassengerToTravel.tsxfrontend/containers/NewPassengerDialog/AddPassengerToTravel.tsx

@@ -78,6 +78,7 @@ <AddPassengerCommonFields

email={email} emailError={!emailValidated} setEmail={setEmail} + optionalEmail name={name} setName={setName} />
M frontend/locales/en.jsonfrontend/locales/en.json

@@ -166,6 +166,7 @@ "location_helper": "Indicate your preferred departure location",

"location_placeholder": "Meeting place (optionnal)", "email": "Email", "email_placeholder": "Email", + "email_placeholder_optional": "Email (optional)", "email_helpertext": "Email is not valid", "name": "Name", "name_placeholder": "Name"
M frontend/locales/fr.jsonfrontend/locales/fr.json

@@ -166,6 +166,7 @@ "location_helper": "Indiquez votre lieu de départ de préférence",

"location_placeholder": "Lieu de rencontre (optionnel)", "email": "Email", "email_placeholder": "Email", + "email_placeholder_optional": "Email (optionnel)", "email_helpertext": "Email non valide", "name": "Nom", "name_placeholder": "Nom"