Skip to content

Commit

Permalink
Merge pull request #507 from DTS-STN/stefan/release-2-0-fedex-tweaks
Browse files Browse the repository at this point in the history
Put fedex tracking back to the old wording
  • Loading branch information
stefan-oconnell authored Sep 22, 2023
2 parents 69102fc + 5ff086a commit 4a3ea3f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 38 deletions.
6 changes: 1 addition & 5 deletions public/locales/en/status.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,9 @@
"take-up-to": "It can take up to 2 to 3 business days to arrive."
},
"shipped-fedex": {
"bermuda": {
"title": "Special instructions for applicants from Bermuda",
"applied-from": "If you applied for a passport from Bermuda, it will be sent to you via FedEx."
},
"contact-us": "If you don't receive your passport and supporting documents, <Link>contact us</Link>.",
"header": "Your passport has been printed and mailed to you",
"mailing": "We're sending it to you by Canada Post and the United States Postal Service",
"mailing": "We're sending it to you by FedEx",
"supporting-documents": "You'll receive your passport and supporting documents in the same envelope.",
"take-up-to": "It can take up to 5 to 7 business days to arrive."
},
Expand Down
6 changes: 1 addition & 5 deletions public/locales/fr/status.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,9 @@
"take-up-to": "Cela peut prendre jusqu'à 2 à 3 jours ouvrables pour arriver."
},
"shipped-fedex": {
"bermuda": {
"title": "Instructions spéciales pour les demandeurs des Bermudes",
"applied-from": "Si vous avez demandé votre passeport des Bermudes, il vous sera envoyé via FedEx."
},
"contact-us": "Si vous ne recevez pas votre passeport et vos documents, <Link>veuillez nous contacter</Link>.",
"header": "Votre passeport a été imprimé et envoyé par la poste",
"mailing": "Nous vous l'envoyons par Postes Canada et le Service Postal des États-Unis",
"mailing": "Nous vous l'envoyons par FedEx",
"supporting-documents": "Vous recevrez le passeport et les documents justificatifs dans la même enveloppe.",
"take-up-to": "Cela peut prendre jusqu'à 5 à 7 jours ouvrables pour arriver."
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Trans, useTranslation } from 'next-i18next'

import AlertBlock from '../AlertBlock'
import AlertSection from '../AlertSection'
import Collapse from '../Collapse'
import ExternalLink from '../ExternalLink'

export interface CheckStatusShippingFedexProps {
Expand Down Expand Up @@ -40,40 +39,14 @@ export const CheckStatusShippingFedex = ({
Link: (
<ExternalLink
data-gc-analytics-exempt={true}
href={t('status-check-tracking.link.canada-post', {
href={t('status-check-tracking.link.fedex', {
trackingNumber: encodeURIComponent(trackingNumber),
})}
/>
),
}}
/>
</p>
<Collapse title={t('shipped-fedex.bermuda.title')}>
<p>{t('shipped-fedex.bermuda.applied-from')}</p>
<p>
<Trans
i18nKey="status-check-tracking.number"
ns="status"
tOptions={{ trackingNumber }}
/>
</p>
<p>
<Trans
i18nKey={'status-check-tracking.can-track'}
ns="status"
components={{
Link: (
<ExternalLink
data-gc-analytics-exempt={true}
href={t('status-check-tracking.link.fedex', {
trackingNumber: encodeURIComponent(trackingNumber),
})}
/>
),
}}
/>
</p>
</Collapse>
</>
) : (
<p>{t('shipped-fedex.take-up-to')}</p>
Expand Down

0 comments on commit 4a3ea3f

Please sign in to comment.