From 298ca5359330563130dd84cdde427c3ee040d13b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 25 Feb 2025 11:58:11 +0100
Subject: [PATCH] Add choice of law to terms of service generator (#33994)

---
 app/models/terms_of_service/generator.rb                       | 1 +
 app/views/admin/terms_of_service/generates/show.html.haml      | 3 +++
 config/locales/simple_form.en.yml                              | 2 ++
 config/templates/terms-of-service.md                           | 2 +-
 .../admin/terms_of_service/generates_controller_spec.rb        | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/models/terms_of_service/generator.rb b/app/models/terms_of_service/generator.rb
index 83c229720e..6fcfb01154 100644
--- a/app/models/terms_of_service/generator.rb
+++ b/app/models/terms_of_service/generator.rb
@@ -13,6 +13,7 @@ class TermsOfService::Generator
     dmca_email
     domain
     jurisdiction
+    choice_of_law
   ).freeze
 
   attr_accessor(*VARIABLES)
diff --git a/app/views/admin/terms_of_service/generates/show.html.haml b/app/views/admin/terms_of_service/generates/show.html.haml
index 46737e8355..0a67aba295 100644
--- a/app/views/admin/terms_of_service/generates/show.html.haml
+++ b/app/views/admin/terms_of_service/generates/show.html.haml
@@ -22,6 +22,9 @@
   .fields-group
     = form.input :jurisdiction, wrapper: :with_label
 
+  .fields-group
+    = form.input :choice_of_law, wrapper: :with_label
+
   .fields-group
     = form.input :admin_email, wrapper: :with_label
 
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index edf0a29a32..d592352222 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -137,6 +137,7 @@ en:
         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_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_email: Can be the same email used for “Email address for legal notices” above
         domain: Unique identification of the online service you are providing.
@@ -338,6 +339,7 @@ en:
         admin_email: Email address for legal notices
         arbitration_address: Physical address for arbitration notices
         arbitration_website: Website for submitting arbitration notices
+        choice_of_law: Choice of Law
         dmca_address: Physical address for DMCA/copyright notices
         dmca_email: Email address for DMCA/copyright notices
         domain: Domain
diff --git a/config/templates/terms-of-service.md b/config/templates/terms-of-service.md
index 4b11a9897c..0a96b1a606 100644
--- a/config/templates/terms-of-service.md
+++ b/config/templates/terms-of-service.md
@@ -249,7 +249,7 @@ individual basis.
 ## Choice of Law
 
 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
 domiciled, reside, or located at the time of such access or use.
 
diff --git a/spec/controllers/admin/terms_of_service/generates_controller_spec.rb b/spec/controllers/admin/terms_of_service/generates_controller_spec.rb
index c1fc7faef9..b528bfb57a 100644
--- a/spec/controllers/admin/terms_of_service/generates_controller_spec.rb
+++ b/spec/controllers/admin/terms_of_service/generates_controller_spec.rb
@@ -33,6 +33,7 @@ RSpec.describe Admin::TermsOfService::GeneratesController do
             dmca_email: 'dmca@host.example',
             domain: 'host.example',
             jurisdiction: 'Europe',
+            choice_of_law: 'New York',
           },
         }
       end