diff --git a/services/web/app/src/Features/Email/EmailBuilder.js b/services/web/app/src/Features/Email/EmailBuilder.js index 0e46b1b8ea..01565201ac 100644 --- a/services/web/app/src/Features/Email/EmailBuilder.js +++ b/services/web/app/src/Features/Email/EmailBuilder.js @@ -222,10 +222,10 @@ templates.passwordResetRequested = ctaTemplate({ templates.confirmEmail = ctaTemplate({ subject() { - return `Confirm Email - ${settings.appName}` + return `Confirm email - ${settings.appName}` }, title() { - return 'Confirm Email' + return 'Confirm email' }, message(opts) { return [ @@ -239,7 +239,7 @@ templates.confirmEmail = ctaTemplate({ ] }, ctaText() { - return 'Confirm Email' + return 'Confirm email' }, ctaURL(opts) { return opts.confirmEmailUrl @@ -861,7 +861,7 @@ templates.SAMLDataCleared = ctaTemplate({ ] }, ctaText(opts) { - return 'Update my Emails and Affiliations' + return 'Update my Emails and affiliations' }, ctaURL(opts) { return `${settings.siteUrl}/user/settings` @@ -907,7 +907,7 @@ templates.welcome = ctaTemplate({ ] }, ctaText() { - return 'Confirm Email' + return 'Confirm email' }, ctaURL(opts) { return opts.confirmEmailUrl diff --git a/services/web/app/src/Features/Subscription/SubscriptionController.js b/services/web/app/src/Features/Subscription/SubscriptionController.js index 9b2cec1398..6116a71174 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionController.js +++ b/services/web/app/src/Features/Subscription/SubscriptionController.js @@ -86,7 +86,7 @@ async function userSubscriptionPage(req, res) { const groupPlansDataForDash = formatGroupPlansDataForDash() - // display the Group Settings button only to admins of group subscriptions with either/or the Managed Users or Group SSO feature available + // display the Group settings button only to admins of group subscriptions with either/or the Managed Users or Group SSO feature available let groupSettingsEnabledFor try { const managedGroups = await async.filter( diff --git a/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs b/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs index ff4b93e88c..276524dd02 100644 --- a/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs +++ b/services/web/app/src/Features/TokenAccess/TokenAccessController.mjs @@ -66,7 +66,7 @@ async function _handleV1Project(token, userId) { userId ) // This should not happen anymore, but it does show - // a nice "contact support" message, so it can stay + // a nice "contact Support" message, so it can stay if (!docInfo) { return { v1Import: { status: 'cannotImport' } } } diff --git a/services/web/app/templates/project_files/example-project/main.tex b/services/web/app/templates/project_files/example-project/main.tex index 5199b66d9d..45d982a2f6 100644 --- a/services/web/app/templates/project_files/example-project/main.tex +++ b/services/web/app/templates/project_files/example-project/main.tex @@ -49,7 +49,7 @@ Note that your figure will automatically be placed in the most appropriate place \subsection{How to add Tables} -Use the table and tabular environments for basic tables --- see Table~\ref{tab:widgets}, for example. For more information, please see this help article on \href{https://www.overleaf.com/learn/latex/tables}{tables}. +Use the table and tabular environments for basic tables --- see Table~\ref{tab:widgets}, for example. For more information, please see this help article on \href{https://www.overleaf.com/learn/latex/tables}{tables}. \begin{table} \centering @@ -65,7 +65,7 @@ Gadgets & 13 Comments can be added to your project by highlighting some text and clicking ``Add comment'' in the top right of the editor pane. To view existing comments, click on the Review menu in the toolbar above. To reply to a comment, click on the Reply button in the lower right corner of the comment. You can close the Review pane by clicking its name on the toolbar when you're done reviewing for the time being. -Track changes are available on all our \href{https://www.overleaf.com/user/subscription/plans}{premium plans}, and can be toggled on or off using the option at the top of the Review pane. Track changes allow you to keep track of every change made to the document, along with the person making the change. +Track changes are available on all our \href{https://www.overleaf.com/user/subscription/plans}{premium plans}, and can be toggled on or off using the option at the top of the Review pane. Track changes allow you to keep track of every change made to the document, along with the person making the change. \subsection{How to add Lists} @@ -97,7 +97,7 @@ If however you're using a more general template, such as this one, and would lik \subsection{How to change the document language and spell check settings} -Overleaf supports many different languages, including multiple different languages within one document. +Overleaf supports many different languages, including multiple different languages within one document. To configure the document language, simply edit the option provided to the babel package in the preamble at the top of this example project. To learn more about the different options, please visit this help article on \href{https://www.overleaf.com/learn/latex/International_language_support}{international language support}. @@ -111,9 +111,9 @@ If you have an \href{https://www.overleaf.com/user/subscription/plans}{upgraded \subsection{Good luck!} -We hope you find Overleaf useful, and do take a look at our \href{https://www.overleaf.com/learn}{help library} for more tutorials and user guides! Please also let us know if you have any feedback using the Contact Us link at the bottom of the Overleaf menu --- or use the contact form at \url{https://www.overleaf.com/contact}. +We hope you find Overleaf useful, and do take a look at our \href{https://www.overleaf.com/learn}{help library} for more tutorials and user guides! Please also let us know if you have any feedback using the \textbf{Contact us} link at the bottom of the Overleaf menu --- or use the contact form at \url{https://www.overleaf.com/contact}. \bibliographystyle{alpha} \bibliography{sample} -\end{document} \ No newline at end of file +\end{document} diff --git a/services/web/app/views/_mixins/back_to_btns.pug b/services/web/app/views/_mixins/back_to_btns.pug index da1c9c09db..570237b5bc 100644 --- a/services/web/app/views/_mixins/back_to_btns.pug +++ b/services/web/app/views/_mixins/back_to_btns.pug @@ -1,4 +1,4 @@ mixin back-to-btns(settingsAnchor) - a.btn.btn-secondary.text-capitalize(href=`/user/settings${settingsAnchor ? '#' + settingsAnchor : '' }`) #{translate('back_to_account_settings')} + a.btn.btn-secondary(href=`/user/settings${settingsAnchor ? '#' + settingsAnchor : '' }`) #{translate('back_to_account_settings')} | - a.btn.btn-secondary.text-capitalize(href='/project') #{translate('back_to_your_projects')} \ No newline at end of file + a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')} diff --git a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug index ee94394bc4..92e2d4301d 100644 --- a/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug +++ b/services/web/app/views/layout/navbar-marketing-bootstrap-5.pug @@ -178,7 +178,7 @@ nav.navbar.navbar-default.navbar-main.navbar-expand-lg(class={ +dropdown-menu-item div.disabled.dropdown-item #{getSessionUser().email} +dropdown-menu-divider - +dropdown-menu-link-item()(href="/user/settings") #{translate('Account Settings')} + +dropdown-menu-link-item()(href="/user/settings") #{translate('account_settings')} if nav.showSubscriptionLink +dropdown-menu-link-item()(href="/user/subscription") #{translate('subscription')} +dropdown-menu-divider diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug index e0f36004b8..c5e9f2e0bf 100644 --- a/services/web/app/views/layout/navbar-marketing.pug +++ b/services/web/app/views/layout/navbar-marketing.pug @@ -186,7 +186,7 @@ nav.navbar.navbar-default.navbar-main(class={ div.subdued #{getSessionUser().email} li.divider.hidden-xs.hidden-sm li - a(href="/user/settings") #{translate('Account Settings')} + a(href="/user/settings") #{translate('account_settings')} if nav.showSubscriptionLink li a(href="/user/subscription") #{translate('subscription')} diff --git a/services/web/app/views/layout/navbar-website-redesign.pug b/services/web/app/views/layout/navbar-website-redesign.pug index c4b712e955..8ea71861c0 100644 --- a/services/web/app/views/layout/navbar-website-redesign.pug +++ b/services/web/app/views/layout/navbar-website-redesign.pug @@ -184,7 +184,7 @@ nav.navbar.navbar-default.navbar-main.website-redesign-navbar div.subdued #{getSessionUser().email} li.divider.hidden-xs.hidden-sm li - a(href="/user/settings") #{translate('Account Settings')} + a(href="/user/settings") #{translate('account_settings')} if nav.showSubscriptionLink li a(href="/user/subscription") #{translate('subscription')} diff --git a/services/web/app/views/user/reconfirm.pug b/services/web/app/views/user/reconfirm.pug index 5db1d811c7..7c17423d5a 100644 --- a/services/web/app/views/user/reconfirm.pug +++ b/services/web/app/views/user/reconfirm.pug @@ -23,7 +23,7 @@ block content .row .col-sm-12.col-md-6.col-md-offset-3 .card - h1.card-header.text-capitalize #{translate("reconfirm")} #{translate("Account")} + h1.card-header #{translate("reconfirm")} #{translate("Account")} p #{translate('reconfirm_explained')} a(href=`mailto:${settings.adminEmail}`) #{settings.adminEmail} | . diff --git a/services/web/app/views/user/sessions.pug b/services/web/app/views/user/sessions.pug index 99905a960d..187c1dae75 100644 --- a/services/web/app/views/user/sessions.pug +++ b/services/web/app/views/user/sessions.pug @@ -67,6 +67,6 @@ block content p.text-success.text-center | #{translate('clear_sessions_success')} .page-separator - a.btn.btn-secondary.text-capitalize(href='/user/settings') #{translate('back_to_account_settings')} + a.btn.btn-secondary(href='/user/settings') #{translate('back_to_account_settings')} | - a.btn.btn-secondary.text-capitalize(href='/project') #{translate('back_to_your_projects')} + a.btn.btn-secondary(href='/project') #{translate('back_to_your_projects')} diff --git a/services/web/app/views/user_membership/new.pug b/services/web/app/views/user_membership/new.pug index 6a88249ca6..c59837b107 100644 --- a/services/web/app/views/user_membership/new.pug +++ b/services/web/app/views/user_membership/new.pug @@ -15,7 +15,7 @@ block content action='' ) input(name="_csrf", type="hidden", value=csrfToken) - button.btn.btn-primary.text-capitalize( + button.btn.btn-primary( type="submit", data-ol-disabled-inflight ) diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 6e2205aed4..a8fd6b8169 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -5,7 +5,6 @@ "3_4_width": "", "About": "", "Account": "", - "Account Settings": "", "Documentation": "", "Get Involved": "", "Help": "", diff --git a/services/web/frontend/js/features/settings/components/linking-section.tsx b/services/web/frontend/js/features/settings/components/linking-section.tsx index 69d2dc268e..0b9001927e 100644 --- a/services/web/frontend/js/features/settings/components/linking-section.tsx +++ b/services/web/frontend/js/features/settings/components/linking-section.tsx @@ -90,9 +90,7 @@ function LinkingSection() {
{t('linked_accounts_explained')}
{haslangFeedbackLinkingWidgets ? ( <> -