zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Added a warning to look into the spam folder (#2921) 

Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.
This commit is contained in:
jeroenpraat 2017-05-17 02:55:37 +02:00 committed by Eugen Rochko
parent eab93992d1
commit 7c1f3f8163
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/locales/devise.en.yml
View File

@ -3,8 +3,8 @@ en:
devise: devise:
confirmations: confirmations:
confirmed: Your email address has been successfully confirmed. confirmed: Your email address has been successfully confirmed.
send_instructions: You will receive an email with instructions for how to confirm your email address in a few minutes. send_instructions: You will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
send_paranoid_instructions: If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes. send_paranoid_instructions: If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes. Please check your spam folder if you didn't receive this email.
failure: failure:
already_authenticated: You are already signed in. already_authenticated: You are already signed in.
inactive: Your account is not activated yet. inactive: Your account is not activated yet.
@ -29,8 +29,8 @@ en:
success: Successfully authenticated from %{kind} account. success: Successfully authenticated from %{kind} account.
passwords: passwords:
no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided. no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided.
send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. send_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn't receive this email.
updated: Your password has been changed successfully. You are now signed in. updated: Your password has been changed successfully. You are now signed in.
updated_not_active: Your password has been changed successfully. updated_not_active: Your password has been changed successfully.
registrations: registrations:
@ -38,16 +38,16 @@ en:
signed_up: Welcome! You have signed up successfully. signed_up: Welcome! You have signed up successfully.
signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated. signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked. signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account. signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account. Please check your spam folder if you didn't receive this email.
update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address. update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address. Please check your spam folder if you didn't receive this email.
updated: Your account has been updated successfully. updated: Your account has been updated successfully.
sessions: sessions:
already_signed_out: Signed out successfully. already_signed_out: Signed out successfully.
signed_in: Signed in successfully. signed_in: Signed in successfully.
signed_out: Signed out successfully. signed_out: Signed out successfully.
unlocks: unlocks:
send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes. send_instructions: You will receive an email with instructions for how to unlock your account in a few minutes. Please check your spam folder if you didn't receive this email.
send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes. send_paranoid_instructions: If your account exists, you will receive an email with instructions for how to unlock it in a few minutes. Please check your spam folder if you didn't receive this email.
unlocked: Your account has been unlocked successfully. Please sign in to continue. unlocked: Your account has been unlocked successfully. Please sign in to continue.
errors: errors:
messages: messages: