Merge pull request #491 from DTS-STN/stefan/shipped-us-changes

Updated US bound shipped status with canada post link, added Bermuda …
DTS-STN · Aug 31, 2023 · 4278098 · 4278098
2 parents 9a37caa + 657e1a7
commit 4278098
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/public/locales/en/email.json b/public/locales/en/email.json
@@ -20,7 +20,7 @@
     "dont-receive": "If you don't receive an email, you can:",
     "dont-receive-list": {
       "item-1": "review the information you entered and try again or",
-      "item-2": "try again tomorrow — we update our records daily"
+      "item-2": "try again tomorrow—we update our records daily"
     },
     "if-exists": "If we can find the file with the information you gave us, <strong>we'll email you the file number or reference number</strong>. If you don't receive the email in your inbox, check your junk folder.",
     "may-not-receive": "You may not receive an email if:",

diff --git a/public/locales/en/status.json b/public/locales/en/status.json
@@ -82,9 +82,13 @@
     "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 couriered to you",
-    "mailing": "We're sending it to you by FedEx\u00AE",
+    "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",
     "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."
   },

diff --git a/public/locales/fr/status.json b/public/locales/fr/status.json
@@ -82,9 +82,13 @@
     "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é au service de messagerie",
-    "mailing": "Nous vous l'envoyons par FedEx\u00AE",
+    "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",
     "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."
   },
@@ -93,7 +97,7 @@
     "service-standard-href": "https://www.canada.ca/fr/immigration-refugies-citoyennete/services/passeports-canadiens/delais-traitement.html"
   },
   "status-check-tracking": {
-    "can-track": "Vous pouvez <Link>faire le suivi de l'envoi en ligne</Link>.",
+    "can-track": "Vous pouvez <Link>suivre en ligne la livraison de votre colis</Link>.",
     "link": {
       "canada-post": "https://www.canadapost-postescanada.ca/track-reperage/fr#/details/{{trackingNumber}}",
       "fedex": "https://www.fedex.com/fedextrack/?action=track&cntry_code=ca&locale=fr_ca&trackingnumber={{trackingNumber}}"

diff --git a/src/components/check-status-responses/CheckStatusShippingFedex.tsx b/src/components/check-status-responses/CheckStatusShippingFedex.tsx
@@ -2,6 +2,7 @@ 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 {
@@ -39,14 +40,40 @@ export const CheckStatusShippingFedex = ({
                   Link: (
                     <ExternalLink
                       data-gc-analytics-exempt={true}
-                      href={t('status-check-tracking.link.fedex', {
+                      href={t('status-check-tracking.link.canada-post', {
                         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>