gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-09 05:06:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Take review feedback into account

Browse Source
This commit is contained in:
Claire 2025-05-05 14:27:53 +02:00
parent 5d74414e9b
commit a6c8f33fc5
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/web_app_controller_concern.rb
View File

@ -47,7 +47,7 @@ module WebAppControllerConcern
protected protected
def redirect_to_tos_interstitial! def redirect_to_tos_interstitial!
return unless current_user&.require_tos_interstitial return unless current_user&.require_tos_interstitial?
redirect_to(terms_of_service_interstitial_url) redirect_to(terms_of_service_interstitial_url)
end end

3
app/views/terms_of_service_interstitial/show.html.haml
View File

@ -6,7 +6,8 @@
.simple_form .simple_form
%h1.title= t('terms_of_service_interstitial.title', domain: site_hostname) %h1.title= t('terms_of_service_interstitial.title', domain: site_hostname)
%p.lead= t('terms_of_service_interstitial.preamble_html', date: l(@terms_of_service.effective_date || Time.zone.today)) - effective_date = @terms_of_service.effective_date || Time.zone.today
%p.lead= effective_date.past? ? t('terms_of_service_interstitial.past_preamble_html') : t('terms_of_service_interstitial.future_preamble_html', date: l(effective_date))
%p.lead= t('user_mailer.terms_of_service_changed.agreement', domain: site_hostname) %p.lead= t('user_mailer.terms_of_service_changed.agreement', domain: site_hostname)

3
config/locales/en.yml
View File

@ -1913,7 +1913,8 @@ en:
terms_of_service: terms_of_service:
title: Terms of Service title: Terms of Service
terms_of_service_interstitial: terms_of_service_interstitial:
preamble_html: We're making some changes to our terms of service, effective <strong>%{date}</strong>. We encourage you to review the updated terms. future_preamble_html: We're making some changes to our terms of service, which will be effective on <strong>%{date}</strong>. We encourage you to review the updated terms.
past_preamble_html: We have changed our terms of service since your last visit. We encourage you to review the updated terms.
review_link: Review terms of service review_link: Review terms of service
title: The terms of service of %{domain} are changing title: The terms of service of %{domain} are changing
themes: themes:

4
spec/workers/admin/distribute_terms_of_service_notification_worker_spec.rb
View File

@ -28,8 +28,8 @@ RSpec.describe Admin::DistributeTermsOfServiceNotificationWorker do
subject: I18n.t('user_mailer.terms_of_service_changed.subject') subject: I18n.t('user_mailer.terms_of_service_changed.subject')
) )
expect(user.reload.require_tos_interstitial).to be false expect(user.reload.require_tos_interstitial?).to be false
expect(old_user.reload.require_tos_interstitial).to be true expect(old_user.reload.require_tos_interstitial?).to be true
end end
end end
end end