Просмотр исходного кода

[web] Update commons notifications (#12149)

GitOrigin-RevId: 0a39ce64c34467cd3a2c3304c2aba5e8bea64956
Mathias Jakobsen 3 лет назад
Родитель
Сommit
89ce4757fa

+ 13 - 13
services/web/locales/en.json

@@ -169,7 +169,7 @@
   "cancel": "Cancel",
   "cancel_anytime": "We’re confident that you’ll love __appName__, but if not you can cancel anytime. We’ll give you your money back, no questions asked, if you let us know within 30 days.",
   "cancel_my_account": "Cancel my subscription",
-  "cancel_personal_subscription_first": "You already have a personal subscription, would you like us to cancel this first before joining the group licence?",
+  "cancel_personal_subscription_first": "You already have an individual subscription, would you like us to cancel this first before joining the group licence?",
   "cancel_your_subscription": "Cancel Your Subscription",
   "cannot_invite_non_user": "Can’t send invite. Recipient must already have an __appName__ account",
   "cannot_invite_self": "Can’t send invite to yourself",
@@ -227,14 +227,14 @@
   "collaborate_online_and_offline": "Collaborate online and offline, using your own workflow",
   "collaboration": "Collaboration",
   "collaborator": "Collaborator",
-  "collabratec_account_not_registered": "IEEE Collabratec™ account not registered. Please connect to Overleaf from IEEE Collabratec™ or login with a different account.",
+  "collabratec_account_not_registered": "IEEE Collabratec™ account not registered. Please connect to Overleaf from IEEE Collabratec™ or log in with a different account.",
   "collabs_per_proj": "__collabcount__ collaborators per project",
   "collabs_per_proj_single": "__collabcount__ collaborator per project",
   "collapse": "Collapse",
   "comment": "Comment",
   "commit": "Commit",
   "common": "Common",
-  "commons_plan_tooltip": "You’re on the __plan__ plan because of your affiliation with __institution__. Click to find out how to make the most of your Overleaf premium features!",
+  "commons_plan_tooltip": "You’re on the __plan__ plan because of your affiliation with __institution__. Click to find out how to make the most of your Overleaf premium features.",
   "compact": "Compact",
   "company_name": "Company Name",
   "compare_plan_features": "Compare Plan Features",
@@ -528,7 +528,7 @@
   "free_accounts_have_timeout_upgrade_to_increase": "Free accounts have a one minute timeout, whereas upgraded accounts have a timeout of four minutes.",
   "free_dropbox_and_history": "Free Dropbox and History",
   "free_plan_label": "You’re on the <b>free plan</b>",
-  "free_plan_tooltip": "Click to find out how you could benefit from Overleaf premium features!",
+  "free_plan_tooltip": "Click to find out how you could benefit from Overleaf premium features.",
   "from_another_project": "From Another Project",
   "from_external_url": "From External URL",
   "from_provider": "From __provider__",
@@ -633,8 +633,8 @@
   "group_members_and_collaborators_get_access_to_info": "These features are available to group members and their collaborators (other Overleaf users invited to projects owned a group member).",
   "group_members_get_access_to": "Group members get access to",
   "group_members_get_access_to_info": "These features are available only to group members (subscribers).",
-  "group_plan_tooltip": "You are on the __plan__ plan as a member of a group subscription. Click to find out how to make the most of your Overleaf premium features!",
-  "group_plan_with_name_tooltip": "You are on the __plan__ plan as a member of a group subscription, __groupName__. Click to find out how to make the most of your Overleaf premium features!",
+  "group_plan_tooltip": "You are on the __plan__ plan as a member of a group subscription. Click to find out how to make the most of your Overleaf premium features.",
+  "group_plan_with_name_tooltip": "You are on the __plan__ plan as a member of a group subscription, __groupName__. Click to find out how to make the most of your Overleaf premium features.",
   "group_plans": "Group Plans",
   "group_professional": "Group Professional",
   "group_standard": "Group Standard",
@@ -872,7 +872,7 @@
   "longer_compile_timeout": "Longer <0>compile timeout</0>",
   "looking_multiple_licenses": "Looking for multiple licenses?",
   "looks_like_logged_in_with_email": "It looks like you’re already logged in to <b>__appName__</b> with the email <b>__email__</b>.",
-  "looks_like_youre_at": "It looks like you’re at <0>__institutionName__</0>!",
+  "looks_like_youre_at": "It looks like you’re at <0>__institutionName__</0>.",
   "lost_connection": "Lost Connection",
   "main_document": "Main document",
   "main_file_not_found": "Unknown main document",
@@ -994,8 +994,8 @@
   "note_experiments_under_development": "<0>Please note</0> that experiments in this program are still being tested and actively developed. This means that they might <0>change</0>, be <0>removed</0> or <0>become part of a paid plan</0>",
   "note_features_under_development": "<0>Please note</0> that features in this program are still being tested and actively developed. This means that they might <0>change</0>, be <0>removed</0> or <0>become part of a premium plan</0>",
   "nothing_to_install_ready_to_go": "There’s nothing complicated or difficult for you to install, and you can <0>__start_now__</0>, even if you’ve never seen it before. __appName__ comes with a complete, ready to go LaTeX environment which runs on our servers.",
-  "notification_features_upgraded_by_affiliation": "Good news! Your affiliated organization __institutionName__ has a partnership with Overleaf, and you now have access to all of Overleaf’s Professional features.",
-  "notification_personal_subscription_not_required_due_to_affiliation": " Good news! Your affiliated organization __institutionName__ has a partnership with Overleaf, and you now have access to Overleaf’s Professional features through your affiliation. You can cancel your personal subscription without losing access to any of your benefits.",
+  "notification_features_upgraded_by_affiliation": "Good news! Your affiliated organization __institutionName__ has an Overleaf subscription, and you now have access to all of Overleaf’s Professional features.",
+  "notification_personal_subscription_not_required_due_to_affiliation": " Good news! Your affiliated organization __institutionName__ has an Overleaf subscription, and you now have access to Overleaf’s Professional features through your affiliation. You can cancel your individual subscription without losing access to any features.",
   "notification_project_invite": "<b>__userName__</b> would like you to join <b>__projectName__</b> <a class=\"btn btn-sm btn-info pull-right\" href=\"/project/__projectId__/invite/token/__token__\">Join Project</a>",
   "notification_project_invite_accepted_message": "You’ve joined <b>__projectName__</b>",
   "notification_project_invite_message": "<b>__userName__</b> would like you to join <b>__projectName__</b>",
@@ -1075,7 +1075,7 @@
   "personalized_onboarding_info": "We’ll help you get everything set up and then we’re here to answer questions from your users about the platform, templates or LaTeX!",
   "pl": "Polish",
   "plan": "Plan",
-  "plan_tooltip": "You’re on the __plan__ plan. Click to find out how to make the most of your Overleaf premium features!",
+  "plan_tooltip": "You’re on the __plan__ plan. Click to find out how to make the most of your Overleaf premium features.",
   "planned_maintenance": "Planned Maintenance",
   "plans_amper_pricing": "Plans &amp; Pricing",
   "plans_and_pricing": "Plans and Pricing",
@@ -1102,7 +1102,7 @@
   "please_set_main_file": "Please choose the main file for this project in the project menu.  ",
   "plus_more": "plus more",
   "plus_upgraded_accounts_receive": "Plus with an upgraded account you get",
-  "portal_add_affiliation_to_join": "It looks like you are already logged in to __appName__! If you have a __portalTitle__ email you can add it now.",
+  "portal_add_affiliation_to_join": "It looks like you are already logged in to __appName__. If you have a __portalTitle__ email you can add it now.",
   "position": "Position",
   "post_on_facebook": "Post on Facebook",
   "postal_code": "Postal Code",
@@ -1555,7 +1555,7 @@
   "trashing_projects_wont_affect_collaborators": "Trashing projects won’t affect your collaborators.",
   "trial_last_day": "This is the last day of your <b>Overleaf Premium</b> trial",
   "trial_remaining_days": "__days__ more days on your <b>Overleaf Premium</b> trial",
-  "tried_to_log_in_with_email": "You’ve tried to login with <b>__email__</b>.",
+  "tried_to_log_in_with_email": "You’ve tried to log in with <b>__email__</b>.",
   "tried_to_register_with_email": "You’ve tried to register with <b>__email__</b>, which is already registered with <b>__appName__</b> as an institutional account.",
   "try_again": "Please try again",
   "try_for_free": "Try for free",
@@ -1688,7 +1688,7 @@
   "you_are_on_a_paid_plan_contact_support_to_find_out_more": "You’re on an __appName__ Paid plan. <0>Contact support</0> to find out more.",
   "you_are_on_x_plan_as_a_confirmed_member_of_institution_y": "You are on our <0>__planName__</0> plan as a <1>confirmed member</1> of <1>__institutionName__</1>",
   "you_are_on_x_plan_as_member_of_group_subscription_y_administered_by_z": "You are on our <0>__planName__</0> plan as a <1>member</1> of the group subscription <1>__groupName__</1> administered by <1>__adminEmail__</1>",
-  "you_can_now_log_in_sso": "You can now log in through your institution and may receive <0>free __appName__ Professional features</0>!",
+  "you_can_now_log_in_sso": "You can now log in through your institution and if eligible you will receive <0>__appName__ Professional features</0>.",
   "you_can_opt_in_and_out_of_galileo_at_any_time_on_this_page": "You can <0>opt in and out</0> of Galileo at any time on this page",
   "you_can_opt_in_and_out_of_overleaf_labs_at_any_time_on_this_page": "You can <0>opt in and out</0> of Overleaf Labs at any time on this page",
   "you_can_opt_in_and_out_of_the_program_at_any_time_on_this_page": "You can <0>opt in and out</0> of the program at any time on this page",

+ 1 - 1
services/web/test/frontend/features/project-list/components/notifications.test.tsx

@@ -438,7 +438,7 @@ describe('<UserNotifications />', function () {
       fetchMock.delete(`/notifications/${institution._id}`, 200)
 
       screen.getByRole('alert')
-      screen.getByText(/you’ve tried to login with/i)
+      screen.getByText(/you’ve tried to log in with/i)
       screen.getByText(
         /in order to match your institutional metadata, your account is associated with/i
       )