gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Add explanation text to log-in page (#20946)

gh/stable
Claire 2022-12-15 16:44:29 +01:00 committed by GitHub
parent 725f21662f
commit bbc49f15e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@
- unless omniauth_only? - unless omniauth_only?
= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
%h1.title= t('auth.sign_in.title', domain: site_hostname)
%p.lead= t('auth.sign_in.preamble_html', domain: site_hostname)
.fields-group .fields-group
- if use_seamless_external_login? - if use_seamless_external_login?
= f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label': t('simple_form.labels.defaults.username_or_email') }, hint: false = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.username_or_email'), input_html: { 'aria-label': t('simple_form.labels.defaults.username_or_email') }, hint: false

3
config/locales/en.yml
View File

@ -975,6 +975,9 @@ en:
email_below_hint_html: If the below e-mail address is incorrect, you can change it here and receive a new confirmation e-mail. email_below_hint_html: If the below e-mail address is incorrect, you can change it here and receive a new confirmation e-mail.
email_settings_hint_html: The confirmation e-mail was sent to %{email}. If that e-mail address is not correct, you can change it in account settings. email_settings_hint_html: The confirmation e-mail was sent to %{email}. If that e-mail address is not correct, you can change it in account settings.
title: Setup title: Setup
sign_in:
preamble_html: Sign in with your <strong>%{domain}</strong> credentials. If your account is hosted on a different server, you will not be able to log in here.
title: Sign in to %{domain}
sign_up: sign_up:
preamble: With an account on this Mastodon server, you'll be able to follow any other person on the network, regardless of where their account is hosted. preamble: With an account on this Mastodon server, you'll be able to follow any other person on the network, regardless of where their account is hosted.
title: Let's get you set up on %{domain}. title: Let's get you set up on %{domain}.