From f4455d3e872990eaf3aa690b33bc1e01475e2037 Mon Sep 17 00:00:00 2001 From: M Fahru Date: Wed, 23 Aug 2023 11:26:59 -0700 Subject: [PATCH] Merge pull request #14474 from overleaf/ab-managed-users-copy-url-updates [web] Update URLs and copy in managed users screens GitOrigin-RevId: 97820499c4f8123425ddf103a4cd2666be4db08a --- .../web/app/src/Features/Email/EmailBuilder.js | 9 +++------ .../web/frontend/extracted-translations.json | 1 + .../offboard-managed-user-modal.tsx | 2 +- .../components/managed-account-alert.tsx | 5 +++-- services/web/locales/en.json | 17 +++++++++-------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/services/web/app/src/Features/Email/EmailBuilder.js b/services/web/app/src/Features/Email/EmailBuilder.js index 3af9c703e7..d95d37e335 100644 --- a/services/web/app/src/Features/Email/EmailBuilder.js +++ b/services/web/app/src/Features/Email/EmailBuilder.js @@ -421,7 +421,7 @@ templates.inviteNewUserToJoinManagedUsers = ctaTemplate({ `User accounts in this group are managed by ${_.escape( _formatUserNameAndEmail(opts.admin, 'an admin') )}.`, - `If you accept the owner of the group subscription will have admin rights over your account and control over your stuff.`, + `If you accept, the owner of the group subscription will have admin rights over your account and control over your stuff.`, `What is ${settings.appName}?`, `${settings.appName} is the collaborative online LaTeX editor loved by researchers and technical writers. With thousands of ready-to-use templates and an array of LaTeX learning resources you’ll be up and running in no time.`, ] @@ -463,19 +463,16 @@ templates.surrenderAccountForManagedUsers = ctaTemplate({ message(opts, isPlainText) { const admin = _.escape(_formatUserNameAndEmail(opts.admin, 'an admin')) - const groupName = opts.groupName ?? `a group managed by ${admin}` - - // TODO update with actual wiki link once created const managedUsersLink = EmailMessageHelper.displayLink( 'user account management', - `${settings.siteUrl}/learn/how-to/Managed_Users`, + `${settings.siteUrl}/learn/how-to/Understanding_Managed_Overleaf_Accounts`, isPlainText ) return [ `Your ${settings.appName} account ${_.escape( opts.to - )} is part of ${groupName} and your group administrator has now enabled ${managedUsersLink}. This will ensure that projects aren’t lost when someone leaves the group.`, + )} is part of ${admin}'s group. They’ve now enabled ${managedUsersLink} for the group. This will ensure that projects aren’t lost when someone leaves the group.`, ] }, secondaryMessage(opts, isPlainText) { diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 69571259d8..af539a19a6 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -343,6 +343,7 @@ "following_paths_conflict": "", "font_family": "", "font_size": "", + "for_more_information_see_managed_accounts_section": "", "free_accounts_have_timeout_upgrade_to_increase": "", "free_plan_label": "", "free_plan_tooltip": "", diff --git a/services/web/frontend/js/features/group-management/components/managed-users/offboard-managed-user-modal.tsx b/services/web/frontend/js/features/group-management/components/managed-users/offboard-managed-user-modal.tsx index 972b06330d..d640374426 100644 --- a/services/web/frontend/js/features/group-management/components/managed-users/offboard-managed-user-modal.tsx +++ b/services/web/frontend/js/features/group-management/components/managed-users/offboard-managed-user-modal.tsx @@ -88,7 +88,7 @@ export default function OffboardManagedUserModal({

{t('this_action_cannot_be_reversed')}   - + {t('learn_more_about_managed_users')}

diff --git a/services/web/frontend/js/features/settings/components/managed-account-alert.tsx b/services/web/frontend/js/features/settings/components/managed-account-alert.tsx index 5df0694fcd..a327debc26 100644 --- a/services/web/frontend/js/features/settings/components/managed-account-alert.tsx +++ b/services/web/frontend/js/features/settings/components/managed-account-alert.tsx @@ -31,8 +31,9 @@ export default function ManagedAccountAlert() {
]} // eslint-disable-line jsx-a11y/anchor-has-content, react/jsx-key + components={[ + , // eslint-disable-line jsx-a11y/anchor-has-content, react/jsx-key + ]} />
diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 12f9a9e788..7180a700f7 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -232,7 +232,7 @@ "checking_dropbox_status": "Checking Dropbox status", "checking_project_github_status": "Checking project status in GitHub", "choose_a_custom_color": "Choose a custom color", - "choose_from_group_members": "Choose from Group Members", + "choose_from_group_members": "Choose from group members", "choose_your_plan": "Choose your plan", "city": "City", "claim_discounts": "Claim discounts", @@ -364,7 +364,7 @@ "delete_projects": "Delete Projects", "delete_tag": "Delete Tag", "delete_token": "Delete token", - "delete_user": "Delete User", + "delete_user": "Delete user", "delete_your_account": "Delete your account", "deleted_at": "Deleted At", "deleted_by_on": "Deleted by __name__ on __date__", @@ -571,6 +571,7 @@ "for_groups": "For Groups", "for_groups_or_site_wide": "For groups or site-wide", "for_individuals_and_groups": "For individuals & groups", + "for_more_information_see_managed_accounts_section": "For more information, see the \"Managed Accounts\" section in <0>our terms of use, which you agree to by clicking Accept invitation.", "for_publishers": "For Publishers", "for_students": "For students", "for_students_only": "For students only", @@ -984,7 +985,7 @@ "managed_users_accounts": "Managed user accounts", "managed_users_accounts_plan_info": "Managed Users gives you more control over your group’s use of Overleaf. It ensures tighter management of user access and deletion and allows you to keep control of projects when someone leaves the group.", "managed_users_explanation": "Managed Users ensures you stay in control of your organization’s projects and who owns them. <0>Read more about Managed Users.", - "managed_users_terms": "To use the Managed Users feature, you must agree to the latest version of our customer terms at <0>__link__ on behalf of your organization by selecting \"I agree\" below. These terms will then apply to your organization’s use of Overleaf in place of any previously agreed Overleaf terms, except where we have a signed agreement in place with you, in which case that signed agreement will continue to govern. Please keep a copy for your records", + "managed_users_terms": "To use the Managed Users feature, you must agree to the latest version of our customer terms at <0>__link__ on behalf of your organization by selecting \"I agree\" below. These terms will then apply to your organization’s use of Overleaf in place of any previously agreed Overleaf terms. The exception to this is where we have a signed agreement in place with you, in which case that signed agreement will continue to govern. Please keep a copy for your records.", "managers_cannot_remove_admin": "Admins cannot be removed", "managers_cannot_remove_self": "Managers cannot remove themselves", "managers_management": "Managers management", @@ -1034,7 +1035,7 @@ "navigation": "Navigation", "nearly_activated": "You’re one step away from activating your __appName__ account!", "need_anything_contact_us_at": "If there is anything you ever need please feel free to contact us directly at", - "need_contact_group_admin_to_make_changes": "You’ll need to contact your group admin if you wish to make certain changes to your account. <0>Read more about managed users.", + "need_contact_group_admin_to_make_changes": "You’ll need to contact your group admin if you want to make certain changes to your account. <0>Read more about managed users.", "need_make_changes": "You need to make some changes", "need_more_than_to_licenses_get_in_touch": "Need more than 50 licenses? Please get in touch", "need_more_than_x_licenses": "Need more than __x__ licenses?", @@ -1128,8 +1129,8 @@ "only_group_admin_or_managers_can_delete_your_account_1": "By becoming a managed user, your organization will have admin rights over your account and control over your stuff, including the right to close your account and access, delete and share your stuff. As a result:", "only_group_admin_or_managers_can_delete_your_account_2": "Only your group admin or group managers will be able to delete your account.", "only_group_admin_or_managers_can_delete_your_account_3": "Your group admin and group managers will be able to reassign ownership of your projects to another group member.", - "only_group_admin_or_managers_can_delete_your_account_4": "Once you have become a managed user, you cannot change back.", - "only_group_admin_or_managers_can_delete_your_account_5": "For more information, see the \"Managed Accounts\" section in our terms of use, which you agree to by clicking Accept Invitation", + "only_group_admin_or_managers_can_delete_your_account_4": "Once you have become a managed user, you cannot change back. <0>Learn more about managed Overleaf accounts.", + "only_group_admin_or_managers_can_delete_your_account_5": "For more information, see the \"Managed Accounts\" section in our terms of use, which you agree to by clicking Accept invitation", "open_a_file_on_the_left": "Open a file on the left", "open_as_template": "Open as Template", "open_file": "Edit file", @@ -1390,7 +1391,7 @@ "resend": "Resend", "resend_confirmation_email": "Resend confirmation email", "resend_email": "Resend email", - "resend_managed_user_invite": "Resend Managed User invite", + "resend_managed_user_invite": "Resend managed user invite", "resending_confirmation_email": "Resending confirmation email", "reset_password": "Reset Password", "reset_your_password": "Reset your password", @@ -1677,7 +1678,7 @@ "to_add_email_accounts_need_to_be_linked_2": "To add this email, your <0>__appName__ and <0>__institutionName__ accounts will need to be linked.", "to_add_more_collaborators": "To add more collaborators or turn on link sharing, please ask the project owner", "to_change_access_permissions": "To change access permissions, please ask the project owner", - "to_confirm_transfer_enter_email_address": "To confirm the transfer, enter the email address linked to your account.", + "to_confirm_transfer_enter_email_address": "To accept the invitation, enter the email address linked to your account.", "to_many_login_requests_2_mins": "This account has had too many login requests. Please wait 2 minutes before trying to log in again", "to_modify_your_subscription_go_to": "To modify your subscription go to", "toggle_compile_options_menu": "Toggle compile options menu",