post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Change path of privacy policy page (#19249)

Browse source
This commit is contained in:
Eugen Rochko 2022-09-29 06:22:12 +02:00 • committed by GitHub
parent e623c302d5
commit 36f4c32a38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/layouts/public.html.haml
View file

@ -33,8 +33,7 @@
.column-0
%h4= t 'footer.resources'
%ul
%li= link_to t('about.terms'), terms_path
%li= link_to t('about.privacy_policy'), terms_path
%li= link_to t('about.privacy_policy'), privacy_policy_path
.column-1
%h4= t 'footer.developers'
%ul
@ -57,6 +56,6 @@
.legal-xs
= link_to "v#{Mastodon::Version.to_s}", Mastodon::Version.source_url
·
= link_to t('about.privacy_policy'), terms_path
= link_to t('about.privacy_policy'), privacy_policy_path
= render template: 'layouts/application'

0
app/views/about/terms.html.haml → app/views/privacy/show.html.haml
View file

2
app/views/settings/deletes/show.html.haml
View file

@ -16,7 +16,7 @@
%li.positive-hint= t('deletes.warning.email_contact_html', email: Setting.site_contact_email)
%li.positive-hint= t('deletes.warning.username_available')
%p.hint= t('deletes.warning.more_details_html', terms_path: terms_path)
%p.hint= t('deletes.warning.more_details_html', terms_path: privacy_policy_path)
%hr.spacer/

2
app/views/user_mailer/confirmation_instructions.html.haml
View file

@ -77,4 +77,4 @@
%tbody
%tr
%td.column-cell.text-center
%p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: terms_url
%p= t 'devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url

4
app/views/user_mailer/confirmation_instructions.text.erb
View file

@ -6,7 +6,7 @@
=> <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %>
<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: terms_url)) %>
<%= strip_tags(t('devise.mailer.confirmation_instructions.extra_html', terms_path: about_more_url, policy_path: privacy_policy_url)) %>
=> <%= about_more_url %>
=> <%= terms_url %>
=> <%= privacy_policy_url %>