Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update account deletion strings to mention professional learning for … #24035

Merged
merged 1 commit into from Aug 1, 2018
Merged

Update account deletion strings to mention professional learning for … #24035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/i18n/common/en_us.json
View file
Open in desktop
Expand Up @@ -343,7 +343,7 @@
"delete": "Delete",
"deleteAccount": "Delete Account",
"deleteAccount_studentWarning": "Deleting your account will permanently erase all personal information, coursework, and projects connected to this account.",
"deleteAccount_teacherWarning1": "Deleting your account will permanently erase all personal information, coursework, and projects connected to this account after 28 days. It will also ",
"deleteAccount_teacherWarning1": "Deleting your account will permanently erase all personal information, coursework, projects, and professional learning information connected to this account after 28 days. It will also ",
"deleteAccount_teacherWarning2": "delete your sections and your students’ accounts ",
"deleteAccount_teacherWarning3": "that don’t have a personal login or aren’t in another teacher’s section. Please make sure you have the authority to delete these students’ education records before deleting your own account. ",
"deleteAccount_teacherWarning4": "Give these students a chance to keep using their Code.org accounts by ",
Expand All @@ -353,7 +353,8 @@
"deleteAccountDialog_body1": "WARNING: ",
"deleteAccountDialog_body2": "Deleting your account will ",
"deleteAccountDialog_body3": "permanently erase ",
"deleteAccountDialog_body4": "all your personal information, coursework, and projects linked to this account after 28 days. ",
"deleteAccountDialog_body4_student": "all your personal information, coursework, and projects linked to this account after 28 days. ",
"deleteAccountDialog_body4_teacher": "all your personal information, coursework, projects, and professional learning information linked to this account after 28 days. ",
"deleteAccountDialog_body5": "It will also ",
"deleteAccountDialog_body6": "permanently delete your students’ accounts ",
"deleteAccountDialog_body7": "accounts unless they created a personal login.",
Expand Down
1 change: 1 addition & 0 deletions apps/src/lib/ui/accounts/DeleteAccount.jsx
View file
Open in desktop
Expand Up @@ -191,6 +191,7 @@ export default class DeleteAccount extends React.Component {
/>
<DeleteAccountDialog
isOpen={isDeleteAccountDialogOpen}
isTeacher={isTeacher}
isPasswordRequired={isPasswordRequired}
warnAboutDeletingStudents={isTeacher && hasStudents}
checkboxes={checkboxes}
Expand Down
7 changes: 6 additions & 1 deletion apps/src/lib/ui/accounts/DeleteAccountDialog.jsx
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@ const styles = {
export default class DeleteAccountDialog extends React.Component {
static propTypes = {
isOpen: PropTypes.bool.isRequired,
isTeacher: PropTypes.bool,
isPasswordRequired: PropTypes.bool.isRequired,
warnAboutDeletingStudents: PropTypes.bool.isRequired,
checkboxes: PropTypes.objectOf(PropTypes.shape({
Expand All @@ -70,6 +71,7 @@ export default class DeleteAccountDialog extends React.Component {
render() {
const {
isOpen,
isTeacher,
isPasswordRequired,
warnAboutDeletingStudents,
checkboxes,
Expand Down Expand Up @@ -103,7 +105,10 @@ export default class DeleteAccountDialog extends React.Component {
<strong>{i18n.deleteAccountDialog_body1()}</strong>
{i18n.deleteAccountDialog_body2()}
<strong style={styles.dangerText}>{i18n.deleteAccountDialog_body3()}</strong>
{i18n.deleteAccountDialog_body4()}
{isTeacher
? i18n.deleteAccountDialog_body4_teacher()
: i18n.deleteAccountDialog_body4_student()
}
{warnAboutDeletingStudents &&
<span>
{i18n.deleteAccountDialog_body5()}
Expand Down