Skip to content

Commit

Permalink
chore: Hardcode apostrophe and more doublequote fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
brobro10000 committed Jun 11, 2024
1 parent be55d84 commit ecc52d6
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ const expiryThresholds = {
variant: 'danger',
message: intl.formatMessage({
id: 'adminPortal.learnerCredit.expiresInThirtyDaysNotification.message',
defaultMessage: 'When your plan expires you will lose access to administrative functions and the remaining balance of your plan{apostrophe}s budget(s) will be unusable. Contact support today to renew your plan.',
defaultMessage: "When your plan expires you will lose access to administrative functions and the remaining balance of your plan's budget(s) will be unusable. Contact support today to renew your plan.",
description: 'Message for the notification that the Learner Credit plan is expiring in less than 30 days.',
}, { apostrophe: "'" }),
}),
},
modalTemplate: {
title: intl.formatMessage({
Expand Down Expand Up @@ -161,10 +161,10 @@ const expiryThresholds = {
message: parse(sanitizeHTML(
intl.formatMessage({
id: 'adminPortal.learnerCreditPlan.expiredModal.message',
defaultMessage: `Your Learner Credit plan expired on {date}. You no longer have access to administrative functions and the remaining balance of your plan{apostrophe}s budget(s) are no longer available to spend.
defaultMessage: `Your Learner Credit plan expired on {date}. You no longer have access to administrative functions and the remaining balance of your plan's budget(s) are no longer available to spend.
Please contact your representative if you have any questions or concerns.`,
description: 'Message for the modal that the Learner Credit plan has expired.',
}, { date, apostrophe: "'" }),
}, { date }),
)),
},
variant: PLAN_EXPIRY_VARIANTS.expired,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,9 @@ const DeleteArchivedCoursesDialogs = ({
<p>
<FormattedMessage
id="highlights.highlights.tab.archived.courses.modal.message"
defaultMessage="Deleting the archived courses in this highlight will remove it from your learners{apostrophe} {doubleQuote}Find a Course{doubleQuote}. This action is permanent and cannot be undone."
defaultMessage="Deleting the archived courses in this highlight will remove it from your learners' {doubleQuote}Find a Course{doubleQuote}. This action is permanent and cannot be undone."
description="Message shown in the modal to delete archived courses."
values={{
apostrophe: "'",
doubleQuote: '"',
}}
/>
Expand Down
5 changes: 2 additions & 3 deletions src/components/ContentHighlights/DeleteHighlightSet.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,10 @@ const DeleteHighlightSet = ({ enterpriseId, enterpriseSlug }) => {
<p>
<FormattedMessage
id="highlights.modal.delete.highlight.confirmation.message"
defaultMessage="Deleting this highlight will remove it from your learners{apostrophe} {doubleQoute}Find a Course{doubleQoute}. This action is permanent and cannot be undone."
defaultMessage="Deleting this highlight will remove it from your learners' {doubleQuote}Find a Course{doubleQuote}. This action is permanent and cannot be undone."
description="Confirmation message shown when deleting a highlight."
values={{
apostrophe: "'",
doubleQoute: '"',
doubleQuote: '"',
}}
/>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ const HighlightStepperTitle = () => (
id="highlights.new.highlights.stepper.stepper.step.pro.tip.text.create.title"
defaultMessage="Pro tip: we recommend naming your highlight collection to reflect skills
it aims to develop, or to draw the attention of specific groups it targets.
For example, {doubleQoute}Recommended for Marketing{doubleQoute}
or {doubleQoute}Develop Leadership Skills{doubleQoute}."
For example, {doubleQuote}Recommended for Marketing{doubleQuote}
or {doubleQuote}Develop Leadership Skills{doubleQuote}."
description="Create title pro tip message shown to administrators during creation of new content highlights"
values={{
doubleQoute: '"',
doubleQuote: '"',
}}
/>
</strong>
Expand Down
6 changes: 2 additions & 4 deletions src/components/NotFoundPage/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@ export const NotFound = () => (
<p className="lead">
<FormattedMessage
id="admin.portal.not.found.page.message"
defaultMessage="Oops, sorry we can{apostrophe}t find that page!"
defaultMessage="Oops, sorry we can't find that page!"
description="The message displayed on the 404 page"
values={{ apostrophe: "'" }}
/>
</p>
<p>
<FormattedMessage
id="admin.portal.not.found.page.message2"
defaultMessage="Either something went wrong or the page doesn{apostrophe}t exist anymore."
defaultMessage="Either something went wrong or the page doesn't exist anymore."
description="The message displayed on the 404 page"
values={{ apostrophe: "'" }}
/>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,8 @@ const BudgetActions = ({
<p>
<FormattedMessage
id="lcm.budget.detail.page.overview.budget.actions.people.access.edx"
defaultMessage="People who have received access to discover edX content in your integrated learning platform can spend from this budget{apostrophe}s available balance to enroll."
defaultMessage="People who have received access to discover edX content in your integrated learning platform can spend from this budget's available balance to enroll."
description="Description which tells that people can spend from the budget's available balance to enroll"
values={{ apostrophe: "'" }}
/>
</p>
<Link to={`/${enterpriseSlug}/admin/settings/access`}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ const CancelAssignmentModal = ({
<p>
<FormattedMessage
id="lcm.budget.detail.page.catalog.tab.cancel.assignment.modal.body2"
defaultMessage="The learner will be notified that you have canceled the assignment. The funds associated with this course assignment will move from {doubleQoute}assigned{doubleQoute} back to {doubleQoute}available{doubleQoute}."
defaultMessage="The learner will be notified that you have canceled the assignment. The funds associated with this course assignment will move from {doubleQuote}assigned{doubleQuote} back to {doubleQuote}available{doubleQuote}."
description="Body text for the cancel assignment modal which informs the user that the learner will be notified that the assignment has been canceled."
values={{ doubleQoute: '"' }}
values={{ doubleQuote: '"' }}
/>
</p>
</ModalDialog.Body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ const RemindAssignmentModal = ({
<p>
<FormattedMessage
id="lcm.budget.detail.page.catalog.tab.remind.assignment.modal.body2"
defaultMessage="When your learner completes enrollment, the associated {doubleQoute}assigned{doubleQoute} funds will be marked as {doubleQoute}spent{doubleQoute}."
defaultMessage="When your learner completes enrollment, the associated {doubleQuote}assigned{doubleQuote} funds will be marked as {doubleQuote}spent{doubleQuote}."
description="Text2 for the body of the remind assignment modal"
values={{ doubleQoute: '"' }}
values={{ doubleQuote: '"' }}
/>
</p>
</ModalDialog.Body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,22 @@ const AssignmentAllocationHelpCollapsibles = ({ enterpriseId, course }) => (
<li>
<FormattedMessage
id="lcm.budget.detailsPage.catalog.tab.course.card.total.assignment.cost"
defaultMessage="The total assignment cost will be earmarked as {doubleQoute}assigned{doubleQoute} funds in your
Learner Credit budget so you can{apostrophe}t overspend."
defaultMessage="The total assignment cost will be earmarked as {doubleQuote}assigned{doubleQuote} funds in your
Learner Credit budget so you can't overspend."
description="A step which explains that the total assignment cost will be earmarked as 'assigned' funds in your Learner Credit budget"
values={{
apostrophe: "'",
doubleQoute: '"',
doubleQuote: '"',
}}
/>
</li>
<li>
<FormattedMessage
id="lcm.budget.detail.page.catalog.tab.course.card.course.cost.will.convert"
defaultMessage="The course cost will automatically convert from {doubleQoute}assigned{doubleQoute} to {doubleQoute}spent{doubleQoute} funds
defaultMessage="The course cost will automatically convert from {doubleQuote}assigned{doubleQuote} to {doubleQuote}spent{doubleQuote} funds
when your learners complete registration."
description="A step which explains that the course cost will automatically convert from 'assigned' to 'spent' funds when learners complete registration"
values={{
doubleQoute: '"',
doubleQuote: '"',
}}
/>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ const AssignmentModalSummaryEmptyState = () => (
<div className="h4 mb-0">
<FormattedMessage
id="lcm.budget.detail.page.catalog.tab.course.card.entered.no.learners"
defaultMessage="You haven{apostrophe}t entered any learners yet."
defaultMessage="You haven't entered any learners yet."
description="Error header when no learners have been entered in the assignment modal"
values={{ apostrophe: "'" }}
/>
</div>
<span className="small">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ const AssignmentModalSummaryErrorState = () => (
<div className="h4 mb-0">
<FormattedMessage
id="lcm.budget.detail.page.catalog.tab.assign.course.section.error.header"
defaultMessage="Learners can{apostrophe}t be assigned as entered."
defaultMessage="Learners can't be assigned as entered."
description="Error message header when course assignment fails due to invalid learner emails."
values={{ apostrophe: "'" }}
/>
</div>
<span className="small">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { InfoOutline } from '@openedx/paragon/icons';

const MemberEnrollmentsTableColumnHeader = () => (
<Stack gap={1} direction="horizontal">
<span>
<span data-testid="members-table-enrollments-column-header">
Enrollments
</span>
<OverlayTrigger
Expand Down
6 changes: 2 additions & 4 deletions src/components/settings/SettingsAppearanceTab/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,8 @@ export const SettingsAppearanceTab = ({
<p>
<FormattedMessage
id="adminPortal.settings.portalAppearanceTab.description"
defaultMessage="Customize the appearance of your learner and administrator edX experiences with your organization{apostrophe}s logo and color themes."
defaultMessage="Customize the appearance of your learner and administrator edX experiences with your organization's logo and color themes."
description="Description for the portal appearance section."
values={{ apostrophe: "'" }}
/>
</p>
<Alert
Expand All @@ -116,9 +115,8 @@ export const SettingsAppearanceTab = ({
<Alert.Heading>
<FormattedMessage
id="adminPortal.settings.portalAppearanceTab.errorHeading"
defaultMessage="We{apostrophe}re sorry"
defaultMessage="We're sorry"
description="Heading for error alert."
values={{ apostrophe: "'" }}
/>
</Alert.Heading>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ const SubscriptionExpirationBanner = ({ isSubscriptionPlanDetails }) => {
<Alert.Heading>
{intl.formatMessage({
id: 'admin.portal.subscription.expiration.banner.plan.expired.heading',
defaultMessage: 'This subscription plan{apostrophe}s end date has passed',
defaultMessage: "This subscription plan's end date has passed",
description: 'Heading for expired plan message in subscription expiration banner.',
}, { apostrophe: "'" })}
})}
</Alert.Heading>
{intl.formatMessage({
id: 'admin.portal.subscription.expiration.banner.plan.expired.message',
Expand All @@ -51,9 +51,9 @@ const SubscriptionExpirationBanner = ({ isSubscriptionPlanDetails }) => {
<Alert.Heading>
{intl.formatMessage({
id: 'admin.portal.subscription.expiration.banner.plan.approaching.heading',
defaultMessage: 'This subscription plan{apostrophe}s end date is approaching',
defaultMessage: "This subscription plan's end date is approaching",
description: 'Heading for approaching plan message in subscription expiration banner.',
}, { apostrophe: "'" })}
})}
</Alert.Heading>
{intl.formatMessage(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ const SubscriptionExpiringModal = ({
{
intl.formatMessage({
id: 'admin.portal.subscription.expiration.modal.body.p1',
defaultMessage: `It{apostrophe}s time to renew your subscription contract with edX!
defaultMessage: `It's time to renew your subscription contract with edX!
The edX customer support team is here to help.
Get in touch today to minimize access disruptions for your learners.`,
description: 'Body paragraph 1 for the subscription expiring modal in the admin portal.',
}, {
apostrophe: "'",
})
}
</p>
Expand Down

0 comments on commit ecc52d6

Please sign in to comment.