tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add server rules to sign-up flow (#19296)

Browse Source
This commit is contained in:
Eugen Rochko
2022-10-05 18:57:33 +02:00
committed by GitHub
parent 26f2586b62
commit 679274465b
6 changed files with 101 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/locales/en.yml
View File

@ -1001,10 +1001,8 @@ en:
warning: Be very careful with this data. Never share it with anyone!
your_token: Your access token
auth:
apply_for_account: Request an invite
apply_for_account: Get on waitlist
change_password: Password
checkbox_agreement_html: I agree to the <a href="%{rules_path}" target="_blank">server rules</a> and <a href="%{terms_path}" target="_blank">terms of service</a>
checkbox_agreement_without_rules_html: I agree to the <a href="%{terms_path}" target="_blank">terms of service</a>
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.
description:
@ -1023,6 +1021,7 @@ en:
migrate_account: Move to a different account
migrate_account_html: If you wish to redirect this account to a different one, you can <a href="%{path}">configure it here</a>.
or_log_in_with: Or log in with
privacy_policy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
providers:
cas: CAS
saml: SAML
@ -1030,12 +1029,18 @@ en:
registration_closed: "%{instance} is not accepting new members"
resend_confirmation: Resend confirmation instructions
reset_password: Reset password
rules:
preamble: These are set and enforced by the %{domain} moderators.
title: Some ground rules.
security: Security
set_new_password: Set new password
setup:
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.
title: Setup
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.
title: Let's get you set up on %{domain}.
status:
account_status: Account status
confirming: Waiting for e-mail confirmation to be completed.