scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chore: copy updates for the under-13 flow

Browse source
This commit is contained in:
Georgi Angelov 2024-10-15 13:35:59 +03:00
parent 3defee50cf
commit 7110c6f806
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/dropdown-banner/email-confirmation/banner.jsx
View file

@ -44,7 +44,7 @@ const EmailConfirmationBanner = ({onRequestDismiss, userUsesParentEmail}) => {
), ),
faqLink: ( faqLink: (
<a href="/faq/#accounts"> <a href="/faq/#accounts">
<FormattedMessage id={`${i18nPrefix}.faqLinkText`} /> <FormattedMessage id="emailConfirmationBanner.faqLinkText" />
</a> </a>
) )
}} }}

10
src/components/modal/email-confirmation/modal.jsx
View file

@ -20,6 +20,8 @@ const EmailConfirmationModal = ({
'emailConfirmationModal.parentEmail' : 'emailConfirmationModal.parentEmail' :
'emailConfirmationModal'; 'emailConfirmationModal';
const showFooter = !showEmailTips || !userUsesParentEmail;
return ( return (
<Modal <Modal
className="email-confirmation-modal" className="email-confirmation-modal"
@ -67,15 +69,15 @@ const EmailConfirmationModal = ({
} }
</div> </div>
</div> </div>
<div className="guide-footer"> {showFooter && (<div className="guide-footer">
{showEmailTips ? {showEmailTips ?
(<React.Fragment> (<React.Fragment>
<FormattedMessage <FormattedMessage
id={`${i18nPrefix}.wantMoreInfo`} id="emailConfirmationModal.wantMoreInfo"
values={ values={
{FAQLink: {FAQLink:
(<a href="/faq#accounts"> (<a href="/faq#accounts">
<FormattedMessage id={`${i18nPrefix}.checkOutFAQ`} /> <FormattedMessage id="emailConfirmationModal.checkOutFAQ" />
</a>) </a>)
} }
} }
@ -95,7 +97,7 @@ const EmailConfirmationModal = ({
</a>)}} </a>)}}
/> />
</React.Fragment>)} </React.Fragment>)}
</div> </div>)}
</Modal>); </Modal>);
}; };

17
src/l10n.json
View file

@ -208,8 +208,8 @@
"registration.genderOptionAnother": "Another gender:", "registration.genderOptionAnother": "Another gender:",
"registration.genderOptionPreferNotToSay": "Prefer not to say", "registration.genderOptionPreferNotToSay": "Prefer not to say",
"registration.emailStepTitle": "What's your email?", "registration.emailStepTitle": "What's your email?",
"registration.under13.emailStepTitle": "What's your parent/adult email address?", "registration.under13.emailStepTitle": "What's your parent's email address?",
"registration.under13.emailStepDescription": "They will need to verify your account through an email link.", "registration.under13.emailStepDescription": "We'll send them a link to verify your account.",
"registration.emailStepInfo": "This will help if you forget your password. This information will not be made public on your account.", "registration.emailStepInfo": "This will help if you forget your password. This information will not be made public on your account.",
"registration.goToClass": "Go to Class", "registration.goToClass": "Go to Class",
"registration.invitedBy": "invited by", "registration.invitedBy": "invited by",
@ -263,7 +263,7 @@
"registration.welcomeStepDescription": "You have successfully set up a Scratch account! You are now a member of the class:", "registration.welcomeStepDescription": "You have successfully set up a Scratch account! You are now a member of the class:",
"registration.welcomeStepDescriptionNonEducator": "You’re now logged in! You can start exploring and creating projects.", "registration.welcomeStepDescriptionNonEducator": "You’re now logged in! You can start exploring and creating projects.",
"registration.welcomeStepInstructions": "Want to share and comment? Click the link on the email we sent to {email}.", "registration.welcomeStepInstructions": "Want to share and comment? Click the link on the email we sent to {email}.",
"registration.under13.welcomeStepInstructions": "Want to share and comment? Your parent/guardian needs to confirm your account using the link on the email we sent to {email}.", "registration.under13.welcomeStepInstructions": "In order to share projects and participate in the Scratch community, your parent needs to confirm your account. They can click on the link in the email we sent to {email}.",
"registration.welcomeStepPrompt": "To get started, click on the button below.", "registration.welcomeStepPrompt": "To get started, click on the button below.",
"registration.welcomeStepTitle": "Hurray! Welcome to Scratch!", "registration.welcomeStepTitle": "Hurray! Welcome to Scratch!",
"registration.welcomeStepTitleNonEducator": "Welcome to Scratch, {username}!", "registration.welcomeStepTitleNonEducator": "Welcome to Scratch, {username}!",
@ -272,9 +272,8 @@
"emailConfirmationBanner.confirmLinkText": "Confirm your email", "emailConfirmationBanner.confirmLinkText": "Confirm your email",
"emailConfirmationBanner.faqLinkText": "Having trouble?", "emailConfirmationBanner.faqLinkText": "Having trouble?",
"emailConfirmationBanner.parentEmail.confirm": "A parent/guardian needs to {confirmLink}. {faqLink}", "emailConfirmationBanner.parentEmail.confirm": "A parent needs to {confirmLink} before you can share projects.",
"emailConfirmationBanner.parentEmail.confirmLinkText": "confirm your account", "emailConfirmationBanner.parentEmail.confirmLinkText": "confirm your account",
"emailConfirmationBanner.parentEmail.faqLinkText": "Having trouble?",
"emailConfirmationModal.confirm": "Confirm your email", "emailConfirmationModal.confirm": "Confirm your email",
"emailConfirmationModal.wantToShare": "Want to share on Scratch?", "emailConfirmationModal.wantToShare": "Want to share on Scratch?",
@ -292,15 +291,13 @@
"emailConfirmationModal.parentEmail.confirm": "Confirm your account", "emailConfirmationModal.parentEmail.confirm": "Confirm your account",
"emailConfirmationModal.parentEmail.wantToShare": "Want to share on Scratch?", "emailConfirmationModal.parentEmail.wantToShare": "Want to share on Scratch?",
"emailConfirmationModal.parentEmail.clickEmailLink": "Your parent/guardian needs to confirm your email address by clicking the link in the email we sent to:", "emailConfirmationModal.parentEmail.clickEmailLink": "Your parent needs to click on the link in the email we sent to:",
"emailConfirmationModal.parentEmail.resendEmail": "Resend confirmation email", "emailConfirmationModal.parentEmail.resendEmail": "Resend confirmation email",
"emailConfirmationModal.parentEmail.confirmingTips": "Tips for confirming your email address", "emailConfirmationModal.parentEmail.confirmingTips": "Tips for confirming your email address",
"emailConfirmationModal.parentEmail.tipWaitTenMinutes": "Wait for ten minutes. The email may take a while to arrive.", "emailConfirmationModal.parentEmail.tipWaitTenMinutes": "Wait for ten minutes. The email may take a while to arrive.",
"emailConfirmationModal.parentEmail.tipCheckSpam": "Check your spam folder.", "emailConfirmationModal.parentEmail.tipCheckSpam": "Ask your parent to check their spam folder.",
"emailConfirmationModal.parentEmail.correctEmail": "Make sure your parent's email address is correct, see {accountSettings}.", "emailConfirmationModal.parentEmail.correctEmail": "Make sure your parent's email address is correct. Check your {accountSettings}.",
"emailConfirmationModal.parentEmail.accountSettings": "Account Settings", "emailConfirmationModal.parentEmail.accountSettings": "Account Settings",
"emailConfirmationModal.parentEmail.wantMoreInfo": "Want more information? {FAQLink}",
"emailConfirmationModal.parentEmail.checkOutFAQ": "Check out the FAQ",
"emailConfirmationModal.parentEmail.havingTrouble": "Having Trouble? {tipsLink}", "emailConfirmationModal.parentEmail.havingTrouble": "Having Trouble? {tipsLink}",
"emailConfirmationModal.parentEmail.checkOutTips": "Check out these tips", "emailConfirmationModal.parentEmail.checkOutTips": "Check out these tips",