techhub/mastodon
2
0
Fork 0
Code Activity

Remove broken link to Terms of Service when none are defined (#33699)

Browse Source
This commit is contained in:
Claire
2025-01-23 15:34:30 +01:00
committed by GitHub
parent ffaf458f99
commit 4b4de02fee
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@
.fields-group
= f.input :agreement,
as: :boolean,
label: t('auth.user_agreement_html', privacy_policy_path: privacy_policy_path, terms_of_service_path: terms_of_service_path),
label: TermsOfService.live.exists? ? t('auth.user_agreement_html', privacy_policy_path: privacy_policy_path, terms_of_service_path: terms_of_service_path) : t('auth.user_privacy_agreement_html', privacy_policy_path: privacy_policy_path),
required: false,
wrapper: :with_label

1
config/locales/en.yml
View File

@@ -1209,6 +1209,7 @@ en:
too_fast: Form submitted too fast, try again.
use_security_key: Use security key
user_agreement_html: I have read and agree to the <a href="%{terms_of_service_path}" target="_blank">terms of service</a> and <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
user_privacy_agreement_html: I have read and agree to the <a href="%{privacy_policy_path}" target="_blank">privacy policy</a>
author_attribution:
example_title: Sample text
hint_html: Are you writing news or blog articles outside of Mastodon? Control how you get credited when they are shared on Mastodon.