FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change email address input to be disabled for logged-in users when requesting a new confirmation e-mail (#23247) 

Fixes #23093
This commit is contained in:
Claire 2023-01-24 20:18:25 +01:00 committed by GitHub
parent 6883fddb19
commit dd58db64d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/auth/confirmations/new.html.haml
View File

@ -5,7 +5,7 @@
= render 'shared/error_messages', object: resource = render 'shared/error_messages', object: resource
.fields-group .fields-group
= f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, readonly: current_user.present?, hint: current_user.present? && t('auth.confirmations.wrong_email_hint')
.actions .actions
= f.button :button, t('auth.resend_confirmation'), type: :submit = f.button :button, t('auth.resend_confirmation'), type: :submit

2
config/locales/en.yml
View File

@ -965,6 +965,8 @@ en:
auth: auth:
apply_for_account: Request an account apply_for_account: Request an account
change_password: Password change_password: Password
confirmations:
wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
delete_account: Delete account delete_account: Delete account
delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation. delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
description: description: