{notification.messageOpts.ssoEnabled ? ( @@ -163,6 +169,8 @@ function CommonNotification({ notification }: CommonNotificationProps) { values={{ institutionName: notification.messageOpts.university_name, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} />
{t('add_email_to_claim_features')} @@ -219,6 +227,8 @@ function CommonNotification({ notification }: CommonNotificationProps) { i18nKey="dropbox_duplicate_project_names" components={[]} // eslint-disable-line react/jsx-key values={{ projectName: notification.messageOpts.projectName }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} />
diff --git a/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx b/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx
index 09409c3924..29ba07b7a6 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/groups/confirm-email.tsx
@@ -116,6 +116,8 @@ function ConfirmEmailNotification({ userEmail }: { userEmail: UserEmailData }) {
institutionName: userEmail.affiliation?.institution.name,
emailAddress: userEmail.email,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={[]} // eslint-disable-line react/jsx-key
/>
diff --git a/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/group-invitation-cancel-subscription.tsx b/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/group-invitation-cancel-subscription.tsx
index a73ef74b99..0091e24ad5 100644
--- a/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/group-invitation-cancel-subscription.tsx
+++ b/services/web/frontend/js/features/project-list/components/notifications/groups/group-invitation/group-invitation-cancel-subscription.tsx
@@ -31,6 +31,8 @@ export default function GroupInvitationCancelIndividualSubscriptionNotification(
values={{
inviterName,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>
@@ -55,6 +57,8 @@ function Institution() {
i18nKey="doing_this_allow_log_in_through_institution"
components={{ b: }}
values={{ appName }}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>{' '}
{t('learn_more')}
@@ -82,6 +86,8 @@ function Institution() {
i18nKey="account_has_been_link_to_institution_account"
components={{ b: }}
values={{ appName, email, institutionName }}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>
@@ -97,11 +103,15 @@ function Institution() {
i18nKey="tried_to_log_in_with_email"
components={{ b: }}
values={{ appName, email: requestedEmail }}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>{' '}
![]()
) : (
fromNowDate(project.lastUpdated)
diff --git a/services/web/frontend/js/features/project-list/components/table/project-list-table.tsx b/services/web/frontend/js/features/project-list/components/table/project-list-table.tsx
index 0a5be4c6ec..bd67402ea4 100644
--- a/services/web/frontend/js/features/project-list/components/table/project-list-table.tsx
+++ b/services/web/frontend/js/features/project-list/components/table/project-list-table.tsx
@@ -68,8 +68,8 @@ function ProjectListTable() {
aria-sort={
sort.by === 'title'
? sort.order === 'asc'
- ? t('ascending')
- : t('descending')
+ ? 'ascending'
+ : 'descending'
: undefined
}
>
@@ -92,8 +92,8 @@ function ProjectListTable() {
aria-sort={
sort.by === 'owner'
? sort.order === 'asc'
- ? t('ascending')
- : t('descending')
+ ? 'ascending'
+ : 'descending'
: undefined
}
>
@@ -110,8 +110,8 @@ function ProjectListTable() {
aria-sort={
sort.by === 'lastUpdated'
? sort.order === 'asc'
- ? t('ascending')
- : t('descending')
+ ? 'ascending'
+ : 'descending'
: undefined
}
>
diff --git a/services/web/frontend/js/features/settings/components/emails/actions/make-primary/confirmation-modal.tsx b/services/web/frontend/js/features/settings/components/emails/actions/make-primary/confirmation-modal.tsx
index 8009ebb9b9..d7130d3a0d 100644
--- a/services/web/frontend/js/features/settings/components/emails/actions/make-primary/confirmation-modal.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/actions/make-primary/confirmation-modal.tsx
@@ -33,6 +33,8 @@ function ConfirmationModal({
i18nKey="do_you_want_to_change_your_primary_email_address_to"
components={{ b: }}
values={{ email }}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>
diff --git a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx b/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx
index cc7727202b..3dd7a4dffd 100644
--- a/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx
+++ b/services/web/frontend/js/features/share-project-modal/components/add-collaborators-upgrade-content-default.jsx
@@ -21,6 +21,8 @@ export default function AddCollaboratorsUpgradeContentDefault() {
{t('log_in_with_primary_email_address')}
diff --git a/services/web/frontend/js/features/settings/components/emails/add-email.tsx b/services/web/frontend/js/features/settings/components/emails/add-email.tsx index 7b9a21715d..aae4e5926c 100644 --- a/services/web/frontend/js/features/settings/components/emails/add-email.tsx +++ b/services/web/frontend/js/features/settings/components/emails/add-email.tsx @@ -117,6 +117,8 @@ function AddEmail() { values={{ emailAddressLimit, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[]} // eslint-disable-line react/jsx-key /> diff --git a/services/web/frontend/js/features/settings/components/emails/add-email/sso-linking-info.tsx b/services/web/frontend/js/features/settings/components/emails/add-email/sso-linking-info.tsx index bd8f6cb47c..d9fa7bd036 100644 --- a/services/web/frontend/js/features/settings/components/emails/add-email/sso-linking-info.tsx +++ b/services/web/frontend/js/features/settings/components/emails/add-email/sso-linking-info.tsx @@ -36,6 +36,7 @@ function SsoLinkingInfo({ domainInfo, email }: SSOLinkingInfoProps) { values={{ institutionName: domainInfo.university.name }} // eslint-disable-next-line react/jsx-boolean-value shouldUnescape={true} + tOptions={{ interpolation: { escapeValue: true } }} />
@@ -45,6 +46,7 @@ function SsoLinkingInfo({ domainInfo, email }: SSOLinkingInfoProps) {
values={{ institutionName: domainInfo.university.name }}
// eslint-disable-next-line react/jsx-boolean-value
shouldUnescape={true}
+ tOptions={{ interpolation: { escapeValue: true } }}
/>{' '}
]
@@ -155,6 +157,8 @@ function ReconfirmationInfoPromptText({
values={{
institutionName,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={
/* eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-key */
[]
diff --git a/services/web/frontend/js/features/settings/components/emails/reconfirmation-info/reconfirmation-info-success.tsx b/services/web/frontend/js/features/settings/components/emails/reconfirmation-info/reconfirmation-info-success.tsx
index a19474b06c..eaf9d1e353 100644
--- a/services/web/frontend/js/features/settings/components/emails/reconfirmation-info/reconfirmation-info-success.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/reconfirmation-info/reconfirmation-info-success.tsx
@@ -17,6 +17,8 @@ function ReconfirmationInfoSuccess({
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/group-subscription-membership.tsx b/services/web/frontend/js/features/subscription/components/dashboard/group-subscription-membership.tsx index 5920c42507..b8b00828b8 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/group-subscription-membership.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/group-subscription-membership.tsx @@ -37,6 +37,8 @@ export default function GroupSubscriptionMembership({ groupName: subscription.teamName || '', adminEmail: subscription.admin_id.email, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} />
{subscription.teamNotice && ( diff --git a/services/web/frontend/js/features/subscription/components/dashboard/institution-memberships.tsx b/services/web/frontend/js/features/subscription/components/dashboard/institution-memberships.tsx index 97a72b772e..970a62e7f3 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/institution-memberships.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/institution-memberships.tsx @@ -31,6 +31,8 @@ function InstitutionMemberships() { planName: 'Professional', institutionName: institution.name || '', }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key, jsx-a11y/anchor-has-content , diff --git a/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx b/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx index 2aa38b4c73..0843f5dc03 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/managed-group-subscriptions.tsx @@ -30,6 +30,8 @@ export default function ManagedGroupSubscriptions() { groupName: subscription.teamName || '', adminEmail: subscription.admin_id.email, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} /> ) : (
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/active.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/active.tsx
index f96c499e0c..d711389518 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/active.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/active.tsx
@@ -39,6 +39,8 @@ export function ActiveSubscription({
values={{
planName: subscription.plan.name,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={[
// eslint-disable-next-line react/jsx-key
,
@@ -95,6 +97,8 @@ export function ActiveSubscription({
paymentAmmount: subscription.recurly.displayPrice,
collectionDate: subscription.recurly.nextPaymentDueAt,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={[
// eslint-disable-next-line react/jsx-key
,
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-plan/cancel-subscription.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-plan/cancel-subscription.tsx
index b1c6d45622..a307b51822 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-plan/cancel-subscription.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/cancel-plan/cancel-subscription.tsx
@@ -78,6 +78,8 @@ function NotCancelOption({
values={{
days: 14,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={[
// eslint-disable-next-line react/jsx-key
,
@@ -105,6 +107,8 @@ function NotCancelOption({
values={{
price: planToDowngradeTo.displayPrice,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={[
// eslint-disable-next-line react/jsx-key
,
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
index d3a34d1781..e6e92d6b4c 100644
--- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
+++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/change-to-group-modal.tsx
@@ -27,6 +27,8 @@ function GroupPlanCollaboratorCount({ planCode }: { planCode: string }) {
values={{
collabcount: 10,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>
)
@@ -44,6 +46,8 @@ function EducationDiscountAppliedOrNot({ groupSize }: { groupSize: string }) {
@@ -296,6 +310,8 @@ export function ChangeToGroupModal() {
percent: educationalPercentDiscount,
size: groupSizeForEducationalDiscount,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
/>
@@ -345,6 +361,8 @@ export function ChangeToGroupModal() {
subtotal: groupPlanToChangeToPrice.subtotal,
tax: groupPlanToChangeToPrice.tax,
}}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
components={[
/* eslint-disable-next-line react/jsx-key */
,
@@ -375,7 +393,12 @@ export function ChangeToGroupModal() {
diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx index e03df26544..04aaef757a 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/confirm-change-plan-modal.tsx @@ -69,6 +69,8 @@ export function ConfirmChangePlanModal() { values={{ planName: plan.name, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/keep-current-plan-modal.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/keep-current-plan-modal.tsx index ba42cde5f3..788539b90b 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/keep-current-plan-modal.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/change-plan/modals/keep-current-plan-modal.tsx @@ -57,6 +57,8 @@ export function KeepCurrentPlanModal() { values={{ planName: personalSubscription.plan.name, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-additional-licenses.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-additional-licenses.tsx index ee58117152..d01774cc6e 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-additional-licenses.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-additional-licenses.tsx @@ -14,6 +14,8 @@ export function PendingAdditionalLicenses({ additionalLicenses, totalLicenses, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-plan-change.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-plan-change.tsx index b5c99fd627..5d375c822a 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-plan-change.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/pending-plan-change.tsx @@ -16,6 +16,8 @@ export function PendingPlanChange({ values={{ pendingPlanName: subscription.pendingPlan.name, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , @@ -35,6 +37,8 @@ export function PendingPlanChange({ subscription.recurly.pendingAdditionalLicenses, pendingTotalLicenses: subscription.recurly.pendingTotalLicenses, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/subscription-remainder.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/subscription-remainder.tsx index c619aabe8a..cb343f5f60 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/subscription-remainder.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/subscription-remainder.tsx @@ -17,6 +17,8 @@ function SubscriptionRemainder({ subscription }: SubscriptionRemainderProps) { values={{ terminationDate: subscription.recurly.nextPaymentDueAt, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , @@ -28,6 +30,8 @@ function SubscriptionRemainder({ subscription }: SubscriptionRemainderProps) { values={{ terminationDate: subscription.recurly.nextPaymentDueAt, }} + shouldUnescape + tOptions={{ interpolation: { escapeValue: true } }} components={[ // eslint-disable-next-line react/jsx-key , diff --git a/services/web/frontend/js/features/subscription/components/dashboard/states/active/trial-ending.tsx b/services/web/frontend/js/features/subscription/components/dashboard/states/active/trial-ending.tsx index 8e031e7454..3e7ce439a4 100644 --- a/services/web/frontend/js/features/subscription/components/dashboard/states/active/trial-ending.tsx +++ b/services/web/frontend/js/features/subscription/components/dashboard/states/active/trial-ending.tsx @@ -10,6 +10,8 @@ export function TrialEnding({
{t('accept')}
+ }
+ cy.mount({t('welcome_to_sl')}
+ }
+ cy.mount({t('sort_by_x', { x: 'name' })}
+ }
+ cy.mount(
+
+ )
+ }
+ cy.mount(
+
+ )
+ }
+ cy.mount(
+
+ )
+ }
+ cy.mount(
+
+ )
+ }
+ cy.mount(
+
+ )
+ }
+ cy.mount(
+
+ )
+ }
+ cy.mount(ting" }}
+ shouldUnescape
+ tOptions={{ interpolation: { escapeValue: true } }}
+ />
+ ting?")
+ .find('b')
+ .should('have.length', 1)
+ .should('have.text', "T&e'sting")
+ })
+ })
+})