Merge pull request #32115 from overleaf/jel-web-combine-domain-v1-v2

[web] Combine v1 and v2 domains data for groups with domain capture

GitOrigin-RevId: d718ff3dbceeaad792a618b9d5dd6f3196ebca30

services/web/frontend/extracted-translations.json

@@ -243,6 +243,7 @@
   "caption_above": "",
   "caption_below": "",
   "captions": "",
+  "captured": "",
   "card_details": "",
   "card_details_are_not_valid": "",
   "card_must_be_authenticated_by_3dsecure": "",
@@ -483,7 +484,7 @@
   "doing_this_allow_log_in_through_institution_2": "",
   "doing_this_will_verify_affiliation_and_allow_log_in_2": "",
   "domain": "",
-  "domain_verification": "",
+  "domain_capture": "",
   "done": "",
   "dont_create_personal_projects_in_managed_account": "",
   "dont_forget_you_currently_have": "",
@@ -1045,6 +1046,7 @@
   "linked_accounts": "",
   "linked_collabratec_description": "",
   "linked_file": "",
+  "load_domains_failed": "",
   "loading": "",
   "loading_github_repositories": "",
   "loading_prices": "",
@@ -1216,10 +1218,12 @@
   "no_selection_select_file": "",
   "no_symbols_found": "",
   "no_thanks_cancel_now": "",
+  "no_token": "",
   "normal": "",
   "normally_x_price_per_month": "",
   "normally_x_price_per_year": "",
   "not_a_student": "",
+  "not_captured": "",
   "not_managed": "",
   "not_now": "",
   "notification": "",

services/web/locales/en.json

@@ -307,6 +307,7 @@
   "caption_above": "Caption above",
   "caption_below": "Caption below",
   "captions": "Captions",
+  "captured": "Captured",
   "card_details": "Card details",
   "card_details_are_not_valid": "Card details are not valid",
   "card_must_be_authenticated_by_3dsecure": "Your card must be authenticated with 3D Secure before continuing",
@@ -612,7 +613,7 @@
   "doing_this_allow_log_in_through_institution_2": "Doing this will allow you to log in to <0>__appName__</0> through your institution and will reconfirm your institutional email address.",
   "doing_this_will_verify_affiliation_and_allow_log_in_2": "Doing this will verify your affiliation with <0>__institutionName__</0> and will allow you to log in to <0>__appName__</0> through your institution.",
   "domain": "Domain",
-  "domain_verification": "Domain verification",
+  "domain_capture": "Domain capture",
   "done": "Done",
   "dont_create_personal_projects_in_managed_account": "Don’t create personal projects in a managed account. You can set up a personal __appName__ account under another email address.",
   "dont_forget_you_currently_have": "Don’t forget, you currently have:",
@@ -1332,6 +1333,7 @@
   "linked_collabratec_description": "Use Collabratec to manage your __appName__ projects.",
   "linked_file": "Imported file",
   "links": "Links",
+  "load_domains_failed": "There was an error loading the domains. Please reload the page to try again. If the problem continues please <0>contact us</0>.",
   "loading": "Loading",
   "loading_content": "Creating Project",
   "loading_github_repositories": "Loading your GitHub repositories",
@@ -1557,12 +1559,14 @@
   "no_selection_select_file": "Currently, no file is selected. Please select a file from the file tree.",
   "no_symbols_found": "No symbols found",
   "no_thanks_cancel_now": "No thanks, I still want to cancel",
+  "no_token": "No token",
   "no_update_email": "No, update email",
   "non_deletable_entity": "The specified entity may not be deleted",
   "normal": "Normal",
   "normally_x_price_per_month": "Normally __price__ per month",
   "normally_x_price_per_year": "Normally __price__ per year",
   "not_a_student": "Not a student?",
+  "not_captured": "Not captured",
   "not_found": "Not found",
   "not_found_error_from_the_supplied_url": "The link to open this content on Overleaf pointed to a file that could not be found. If this keeps happening for links on a particular site, please report this to them.",
   "not_managed": "Not managed",

services/web/test/acceptance/src/helpers/Subscription.mjs

@@ -27,6 +27,7 @@ class PromisifiedSubscription {
     this.addOns = options.addOns
     this.paymentProvider = options.paymentProvider
     this.managedUsersEnabled = options.managedUsersEnabled
+    this.v1_id = options.v1_id
   }
 
   async ensureExists() {