From a21db20631e7c8b77e05e0e12050a7d8a30c3004 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com> Date: Wed, 27 Nov 2024 10:14:48 -0500 Subject: [PATCH] Merge pull request #22164 from overleaf/em-subscription-case Fix case in subscription related pages GitOrigin-RevId: df5c1da01a2cc391d081b4dccf882dfe45276766 --- services/web/locales/en.json | 26 +++++++++---------- .../components/dashboard/free-plan.test.tsx | 2 +- .../dashboard/personal-subscription.test.tsx | 2 +- .../dashboard/states/active/active.test.tsx | 10 +++---- .../active/change-plan/change-plan.test.tsx | 6 ++--- ...s-individual-recurly-subscription.test.tsx | 6 ++--- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/services/web/locales/en.json b/services/web/locales/en.json index bde0d138b3..bd0d1fbb94 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -240,7 +240,7 @@ "cancel_my_account": "Cancel my subscription", "cancel_my_subscription": "Cancel my subscription", "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", + "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", "cannot_verify_user_not_robot": "Sorry, we could not verify that you are not a robot. Please check that Google reCAPTCHA is not being blocked by an ad blocker or firewall.", @@ -408,7 +408,7 @@ "create_an_account": "Create an account", "create_first_admin_account": "Create the first Admin account", "create_new_account": "Create new account", - "create_new_subscription": "Create New Subscription", + "create_new_subscription": "Create new subscription", "create_new_tag": "Create new tag", "create_project_in_github": "Create a GitHub repository", "created_at": "Created at", @@ -875,7 +875,7 @@ "group_admins_get_access_to": "Group admins get access to", "group_admins_get_access_to_info": "Special features available only on group plans.", "group_full": "This group is already full", - "group_invitations": "Group Invitations", + "group_invitations": "Group invitations", "group_invite_has_been_sent_to_email": "Group invite has been sent to <0>__email__", "group_libraries": "Group Libraries", "group_managed_by_group_administrator": "User accounts in this group are managed by the group administrator.", @@ -895,7 +895,7 @@ "group_subscription": "Group Subscription", "groups": "Groups", "have_an_extra_backup": "Have an extra backup", - "have_more_days_to_try": "Have another __days__ days on your Trial!", + "have_more_days_to_try": "Have another __days__ days on your trial!", "headers": "Headers", "help": "Help", "help_articles_matching": "Help articles matching your subject", @@ -1254,7 +1254,7 @@ "manage_newsletter": "Manage Your Newsletter Preferences", "manage_publisher_managers": "Manage publisher managers", "manage_sessions": "Manage Your Sessions", - "manage_subscription": "Manage Subscription", + "manage_subscription": "Manage subscription", "managed": "Managed", "managed_user_accounts": "Managed user accounts", "managed_user_invite_has_been_sent_to_email": "Managed User invite has been sent to <0>__email__", @@ -1426,7 +1426,7 @@ "ok_continue_to_project": "OK, continue to project", "ok_join_project": "OK, join project", "on": "On", - "on_free_plan_upgrade_to_access_features": "You are on the __appName__ Free plan. Upgrade to access these <0>Premium Features", + "on_free_plan_upgrade_to_access_features": "You are on the __appName__ Free plan. Upgrade to access these <0>Premium features", "one_collaborator": "Only one collaborator", "one_collaborator_per_project": "1 collaborator per project", "one_free_collab": "One free collaborator", @@ -2068,7 +2068,7 @@ "subscription": "Subscription", "subscription_admin_panel": "admin panel", "subscription_admins_cannot_be_deleted": "You cannot delete your account while on a subscription. Please cancel your subscription and try again. If you keep seeing this message please contact us.", - "subscription_canceled": "Subscription Canceled", + "subscription_canceled": "Subscription canceled", "subscription_canceled_and_terminate_on_x": " Your subscription has been canceled and will terminate on <0>__terminateDate__. No further payments will be taken.", "subscription_will_remain_active_until_end_of_billing_period_x": "Your subscription will remain active until the end of your billing period, <0>__terminationDate__.", "subscription_will_remain_active_until_end_of_trial_period_x": "Your subscription will remain active until the end of your trial period, <0>__terminationDate__.", @@ -2367,14 +2367,14 @@ "update_account_info": "Update Account Info", "update_billing_details": "Update billing details", "update_dropbox_settings": "Update Dropbox Settings", - "update_your_billing_details": "Update Your Billing Details", + "update_your_billing_details": "Update your billing details", "updates_to_project_sharing": "Updates to project sharing", "updating": "Updating", "updating_site": "Updating Site", "upgrade": "Upgrade", "upgrade_cc_btn": "Upgrade now, pay after 7 days", "upgrade_for_12x_more_compile_time": "Upgrade to get 12x more compile time", - "upgrade_now": "Upgrade Now", + "upgrade_now": "Upgrade now", "upgrade_to_add_more_editors": "Upgrade to add more editors to your project", "upgrade_to_add_more_editors_and_access_collaboration_features": "Upgrade to add more editors and access collaboration features like track changes and full project history.", "upgrade_to_get_feature": "Upgrade to get __feature__, plus:", @@ -2426,8 +2426,8 @@ "view_hub": "View Admin Hub", "view_hub_subtext": "Access and download subscription statistics and a list of users", "view_in_template_gallery": "View it in the template gallery", - "view_invitation": "View Invitation", - "view_invoices": "View Invoices", + "view_invitation": "View invitation", + "view_invoices": "View invoices", "view_labs_experiments": "View Labs Experiments", "view_less": "View less", "view_logs": "View logs", @@ -2440,7 +2440,7 @@ "view_options": "View options", "view_pdf": "View PDF", "view_source": "View Source", - "view_your_invoices": "View Your Invoices", + "view_your_invoices": "View your invoices", "viewer": "Viewer", "viewing_x": "Viewing <0>__endTime__", "visual_editor": "Visual Editor", @@ -2584,7 +2584,7 @@ "your_questions_answered": "Your questions answered", "your_role": "Your role", "your_sessions": "Your Sessions", - "your_subscription": "Your Subscription", + "your_subscription": "Your subscription", "your_subscription_has_expired": "Your subscription has expired.", "youre_a_member_of_overleaf_labs": "You’re a member of Overleaf Labs. Don’t forget to check in regularly to see what experiments you can sign up to.", "youre_about_to_disable_single_sign_on": "You’re about to disable single sign-on for all group members.", diff --git a/services/web/test/frontend/features/subscription/components/dashboard/free-plan.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/free-plan.test.tsx index f25e17513f..0aec07d4af 100644 --- a/services/web/test/frontend/features/subscription/components/dashboard/free-plan.test.tsx +++ b/services/web/test/frontend/features/subscription/components/dashboard/free-plan.test.tsx @@ -12,6 +12,6 @@ describe('', function () { } ) - screen.getByText('Upgrade Now') + screen.getByText('Upgrade now') }) }) diff --git a/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx index 1f2fe3973d..0cbf334f5a 100644 --- a/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx +++ b/services/web/test/frontend/features/subscription/components/dashboard/personal-subscription.test.tsx @@ -87,7 +87,7 @@ describe('', function () { screen.getByText('No further payments will be taken.', { exact: false }) - screen.getByRole('link', { name: 'View Your Invoices' }) + screen.getByRole('link', { name: 'View your invoices' }) screen.getByRole('button', { name: 'Reactivate your subscription' }) }) diff --git a/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx index e3b132bb3f..aad32212ca 100644 --- a/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx +++ b/services/web/test/frontend/features/subscription/components/dashboard/states/active/active.test.tsx @@ -57,8 +57,8 @@ describe('', function () { '* Prices may be subject to additional VAT, depending on your country.' ) - screen.getByRole('link', { name: 'Update Your Billing Details' }) - screen.getByRole('link', { name: 'View Your Invoices' }) + screen.getByRole('link', { name: 'Update your billing details' }) + screen.getByRole('link', { name: 'View your invoices' }) } it('renders the dash annual active subscription', function () { @@ -208,7 +208,7 @@ describe('', function () { function showConfirmCancelUI() { const button = screen.getByRole('button', { - name: 'Cancel Your Subscription', + name: 'Cancel your subscription', }) fireEvent.click(button) } @@ -227,7 +227,7 @@ describe('', function () { ) expect(dates.length).to.equal(2) const button = screen.getByRole('button', { - name: 'Cancel Your Subscription', + name: 'Cancel your subscription', }) expect(button).to.exist }) @@ -243,7 +243,7 @@ describe('', function () { ) expect(dates.length).to.equal(3) const button = screen.getByRole('button', { - name: 'Cancel Your Subscription', + name: 'Cancel your subscription', }) expect(button).to.exist }) diff --git a/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx b/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx index 8eb961b588..1a9eccd210 100644 --- a/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx +++ b/services/web/test/frontend/features/subscription/components/dashboard/states/active/change-plan/change-plan.test.tsx @@ -387,7 +387,7 @@ describe('', function () { expect(within(modal).queryByText('tax', { exact: false })).to.be.null - within(modal).getByRole('button', { name: 'Upgrade Now' }) + within(modal).getByRole('button', { name: 'Upgrade now' }) within(modal).getByRole('button', { name: 'Need more than 50 licenses? Please get in touch', @@ -523,7 +523,7 @@ describe('', function () { await openModal() - const buttonConfirm = screen.getByRole('button', { name: 'Upgrade Now' }) + const buttonConfirm = screen.getByRole('button', { name: 'Upgrade now' }) fireEvent.click(buttonConfirm) screen.getByText('processing', { exact: false }) @@ -544,7 +544,7 @@ describe('', function () { await openModal() - const buttonConfirm = screen.getByRole('button', { name: 'Upgrade Now' }) + const buttonConfirm = screen.getByRole('button', { name: 'Upgrade now' }) fireEvent.click(buttonConfirm) screen.getByText('processing', { exact: false }) diff --git a/services/web/test/frontend/features/subscription/components/group-invite/has-individual-recurly-subscription.test.tsx b/services/web/test/frontend/features/subscription/components/group-invite/has-individual-recurly-subscription.test.tsx index 712890f45e..32a02810cb 100644 --- a/services/web/test/frontend/features/subscription/components/group-invite/has-individual-recurly-subscription.test.tsx +++ b/services/web/test/frontend/features/subscription/components/group-invite/has-individual-recurly-subscription.test.tsx @@ -16,7 +16,7 @@ describe('group invite', function () { 'You already have an individual subscription, would you like us to cancel this first before joining the group licence?' ) screen.getByRole('button', { name: 'Not now' }) - screen.getByRole('button', { name: 'Cancel Your Subscription' }) + screen.getByRole('button', { name: 'Cancel your subscription' }) }) it('handles subscription cancellation and calls to change invite view', async function () { @@ -24,7 +24,7 @@ describe('group invite', function () { const setView = sinon.stub() render() const button = await screen.findByRole('button', { - name: 'Cancel Your Subscription', + name: 'Cancel your subscription', }) fireEvent.click(button) await waitFor(() => { @@ -35,7 +35,7 @@ describe('group invite', function () { it('shows error message when cancelling subscription fails', async function () { render( {}} />) const button = await screen.findByRole('button', { - name: 'Cancel Your Subscription', + name: 'Cancel your subscription', }) fireEvent.click(button) await waitFor(() => {