monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add choice of law to terms of service generator (#33994)

This commit is contained in:
Eugen Rochko 2025-02-25 11:58:11 +01:00 committed by GitHub
parent 288e61dfdf
commit 298ca53593
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/terms_of_service/generator.rb
View File

@ -13,6 +13,7 @@ class TermsOfService::Generator
dmca_email dmca_email
domain domain
jurisdiction jurisdiction
choice_of_law
).freeze ).freeze
attr_accessor(*VARIABLES) attr_accessor(*VARIABLES)

3
app/views/admin/terms_of_service/generates/show.html.haml
View File

@ -22,6 +22,9 @@
.fields-group .fields-group
= form.input :jurisdiction, wrapper: :with_label = form.input :jurisdiction, wrapper: :with_label
.fields-group
= form.input :choice_of_law, wrapper: :with_label
.fields-group .fields-group
= form.input :admin_email, wrapper: :with_label = form.input :admin_email, wrapper: :with_label

2
config/locales/simple_form.en.yml
View File

@ -137,6 +137,7 @@ en:
admin_email: Legal notices include counternotices, court orders, takedown requests, and law enforcement requests. admin_email: Legal notices include counternotices, court orders, takedown requests, and law enforcement requests.
arbitration_address: Can be the same as Physical address above, or “N/A” if using email arbitration_address: Can be the same as Physical address above, or “N/A” if using email
arbitration_website: Can be a web form, or “N/A” if using email arbitration_website: Can be a web form, or “N/A” if using email
choice_of_law: City, region, territory or state the internal substantive laws of which shall govern any and all claims.
dmca_address: For US operators, use the address registered in the DMCA Designated Agent Directory. A P.O. Box listing is available upon direct request, use the DMCA Designated Agent Post Office Box Waiver Request to email the Copyright Office and describe that you are a home-based content moderator who fears revenge or retribution for your actions and need to use a P.O. Box to remove your home address from public view. dmca_address: For US operators, use the address registered in the DMCA Designated Agent Directory. A P.O. Box listing is available upon direct request, use the DMCA Designated Agent Post Office Box Waiver Request to email the Copyright Office and describe that you are a home-based content moderator who fears revenge or retribution for your actions and need to use a P.O. Box to remove your home address from public view.
dmca_email: Can be the same email used for “Email address for legal notices” above dmca_email: Can be the same email used for “Email address for legal notices” above
domain: Unique identification of the online service you are providing. domain: Unique identification of the online service you are providing.
@ -338,6 +339,7 @@ en:
admin_email: Email address for legal notices admin_email: Email address for legal notices
arbitration_address: Physical address for arbitration notices arbitration_address: Physical address for arbitration notices
arbitration_website: Website for submitting arbitration notices arbitration_website: Website for submitting arbitration notices
choice_of_law: Choice of Law
dmca_address: Physical address for DMCA/copyright notices dmca_address: Physical address for DMCA/copyright notices
dmca_email: Email address for DMCA/copyright notices dmca_email: Email address for DMCA/copyright notices
domain: Domain domain: Domain

2
config/templates/terms-of-service.md
View File

@ -249,7 +249,7 @@ individual basis.
## Choice of Law ## Choice of Law
Any and all claims related to or arising out of your use of, or access to the Any and all claims related to or arising out of your use of, or access to the
Instance shall be governed by internal substantive laws of New York in all Instance shall be governed by internal substantive laws of %{choice_of_law} in all
respects, without regard for the jurisdiction or forum in which you are respects, without regard for the jurisdiction or forum in which you are
domiciled, reside, or located at the time of such access or use. domiciled, reside, or located at the time of such access or use.

1
spec/controllers/admin/terms_of_service/generates_controller_spec.rb
View File

@ -33,6 +33,7 @@ RSpec.describe Admin::TermsOfService::GeneratesController do
dmca_email: 'dmca@host.example', dmca_email: 'dmca@host.example',
domain: 'host.example', domain: 'host.example',
jurisdiction: 'Europe', jurisdiction: 'Europe',
choice_of_law: 'New York',
}, },
} }
end end