Skip to content

Commit

Permalink
Merge pull request #794 from DTS-STN/ken/a11y-4866
Browse files Browse the repository at this point in the history 
Remove long description from examples and reorder
  • Loading branch information
@ken-blanchard
ken-blanchard authored Dec 2, 2024
2 parents 943df12 + 3b493e1 commit b905ff9
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 252 deletions.
101 changes: 12 additions & 89 deletions public/locales/en/landing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,100 +5,23 @@
"without-reference": "No, I don't have my reference number"
},
"header": "Reference number",
"receipt-1-will-find": {
"list": {
"item-1": "title of receipt: Official Receipt",
"item-10": "total tendered",
"item-11": "balance due",
"item-2": "name of passport office",
"item-3": "mail-out date",
"item-4": "applicant name",
"item-5": "date/time",
"item-6": "file number (circled in red)",
"item-7": "fees for services",
"item-8": "total amount due",
"item-9": "tendered"
},
"text": "On a receipt where the file number is circled you will find:"
},
"receipt-2-pickup-instructions": {
"list": {
"item-1": "statement to remind individuals to please present this pickup slip and personal identification.",
"item-2": {
"list": {
"item-1": "personal appearance of applicant required, or",
"item-2": "I authorize (insert name of person) to pick up my Travel Document. Authorized person must be over 16 years of age and must show personal identification."
},
"text": "there are 2 checkboxes (you must check one):"
},
"item-3": "(signature of applicant)",
"item-4": "statement to remind individuals to please ensure your passport is picked up within 30 days."
},
"text": "At the bottom of the receipt, there are also pickup instructions:"
},
"receipt-2-will-find": {
"list": {
"item-1": "title of receipt: official receipt and pick-up slip",
"item-10": "tendered",
"item-11": "total tendered",
"item-12": "balance due",
"item-2": "name of passport office",
"item-3": "date for pickup",
"item-4": "applicant name",
"item-5": "file number (circled in red)",
"item-6": "date/time",
"item-7": "barcode",
"item-8": "fees for services",
"item-9": "total amount due"
},
"text": "On a receipt where the file number is circled you will find:"
},
"receipt-3-next-steps": {
"list": {
"item-1": "statement to indicate that the application has been received ",
"item-2": "instructions for the next steps on processing the passport",
"item-3": "statement to indicate that the passport will be mailed to the provided mailing address",
"item-4": "anticipated mailing date"
},
"text": "At the bottom of the receipt, there are instructions for next steps and delivery:"
},
"receipt-3-will-find": {
"list": {
"item-1": "title of receipt: official receipt",
"item-10": "total amount due",
"item-11": "method of payment",
"item-12": "payer name",
"item-13": "payment date",
"item-14": "payment total",
"item-15": "balance",
"item-2": "name and address of the passport office",
"item-3": "date and time",
"item-4": "applicant name",
"item-5": "reference number (circled in red)",
"item-6": "barcode",
"item-7": "fees for services",
"item-8": "consular fee",
"item-9": "type of travel document"
},
"text": "On an official receipt where the reference number is circled you will find:"
},
"receipt-image-1": {
"alt": "An example of an official receipt. The file number is circled in the centre of the receipt.",
"descriptive-text": "<strong>An example of an official receipt. The file number is circled in the centre of the receipt.</strong>",
"src": "/Receipt1_EN.png",
"title": "Example receipt 1"
"alt": "Official receipt",
"descriptive-text": "<strong>An example of an official receipt. The reference number is circled in the middle of the receipt, above a barcode.</strong>",
"src": "/receipt-1-en.png",
"title": "Example 1 - Official receipt"
},
"receipt-image-2": {
"alt": "An example of an official receipt and pick-up slip. The file number is circled in the upper left-hand side of the receipt, above a barcode.",
"descriptive-text": "<strong>An example of an official receipt and pick-up slip. The file number is circled in the upper left-hand side of the receipt, above a barcode.</strong>",
"src": "/Receipt2_EN.png",
"title": "Example receipt 2"
"alt": "Alternative official receipt.",
"descriptive-text": "<strong>An example of an official receipt. The file number is circled in the centre of the receipt.</strong>",
"src": "/receipt-2-en.png",
"title": "Example 2 - Alternative official receipt"
},
"receipt-image-3": {
"alt": "An example of an official receipt. The reference number is circled in the middle of the receipt, above a barcode.",
"descriptive-text": "<strong>An example of an official receipt. The reference number is circled in the middle of the receipt, above a barcode.</strong>",
"src": "/Receipt3_EN.png",
"title": "Example receipt 3"
"alt": "Alternative official receipt and pick-up slip.",
"descriptive-text": "<strong>An example of an official receipt and pick-up slip. The file number is circled in the upper left-hand side of the receipt, above a barcode.</strong>",
"src": "/receipt-3-en.png",
"title": "Example 3 - Alternative official receipt and pick-up slip"
},
"where-to-find": {
"header": "Where to find your reference number",
Expand Down
101 changes: 12 additions & 89 deletions public/locales/fr/landing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,100 +5,23 @@
"without-reference": "Non, je n'ai pas mon numéro de référence"
},
"header": "Numéro de référence",
"receipt-1-will-find": {
"list": {
"item-1": "titre du reçu\u00a0: reçu officiel",
"item-10": "somme totale perçu",
"item-11": "solde",
"item-2": "nom du bureau de passeport",
"item-3": "date d'envoi",
"item-4": "nom du requérant",
"item-5": "numéro de dossier (encerclé en rouge)",
"item-6": "date/heure",
"item-7": "droit de service",
"item-8": "montant dû",
"item-9": "perçu"
},
"text": "Sur un reçu, sur lequel le numéro de dossier est encerclé, vous trouverez\u00a0:"
},
"receipt-2-pickup-instructions": {
"list": {
"item-1": "déclaration rappelant aux personnes de présenter ce bordereau de cueillette et une pièce d'identité.",
"item-2": {
"list": {
"item-1": "apparition personnelle du requérant requise, ou",
"item-2": "j'autorise (insérer le nom de la personne) à retirer mon document de voyage. La personne autorisée doit être âgée de plus de 16 ans et doit présenter une pièce d'identité."
},
"text": "il y a 2 cases à cocher (vous devez en cocher une)\u00a0:"
},
"item-3": "(signature du requérant)",
"item-4": "déclaration pour rappeler aux personnes de s'assurer que leur passeport est retiré en moins de 30 jours."
},
"text": "Au bas du reçu, il y a aussi des instructions de cueillette\u00a0:"
},
"receipt-2-will-find": {
"list": {
"item-1": "titre du reçu\u00a0: reçu officiel et bordereau de cueillette",
"item-10": "perçu",
"item-11": "somme totale perçu",
"item-12": "solde",
"item-2": "nom du bureau de passeport",
"item-3": "date de cueillette",
"item-4": "nom du requérant",
"item-5": "numéro de dossier (encerclé en rouge)",
"item-6": "date/heure",
"item-7": "code à barre",
"item-8": "droit de service",
"item-9": "montant dû"
},
"text": "Sur un reçu, sur lequel le numéro de dossier est encerclé, vous trouverez\u00a0:"
},
"receipt-3-next-steps": {
"list": {
"item-1": "déclaration indiquant que la demande a été reçue",
"item-2": "instructions pour les prochaines étapes du traitement du passeport",
"item-3": "déclaration indiquant que le passeport sera envoyé à l'adresse postale fournie",
"item-4": "date d'envoi prévue"
},
"text": "Au bas du reçu, il y a des instructions pour les prochaines étapes et la livraison\u00a0:"
},
"receipt-3-will-find": {
"list": {
"item-1": "titre du reçu\u00a0: reçu officiel",
"item-10": "montant total dû",
"item-11": "mode de paiement",
"item-12": "nom du bénéficiaire",
"item-13": "date du paiement",
"item-14": "montant total du paiement",
"item-15": "solde",
"item-2": "nom et adresse du bureau de passeport",
"item-3": "date et heure",
"item-4": "nom du requérant",
"item-5": "numéro de référence (encerclé en rouge)",
"item-6": "code à barre",
"item-7": "frais relatifs aux services",
"item-8": "frais pour services consulaires",
"item-9": "type de document de voyage"
},
"text": "Sur un reçu officiel où le numéro de référence est encerclé, vous trouverez\u00a0:"
},
"receipt-image-1": {
"alt": "Un exemple de reçu officiel. Le numéro de dossier est entouré au centre du reçu.",
"descriptive-text": "<strong>Exemple de reçu officiel. Le numéro de dossier est encerclé au centre du reçu.</strong>",
"src": "/Receipt1_FR.png",
"title": "Exemple de reçu 1"
"alt": "Reçu officiel.",
"descriptive-text": "<strong>Un exemple de reçu officiel. Le numéro de référence est encerclé au centre du reçu, au-dessus d'un code-barres.</strong>",
"src": "/receipt-1-fr.png",
"title": "Exemple 1 - Reçu officiel"
},
"receipt-image-2": {
"alt": "Exemple d'un reçu officiel et bordereau de cueillette. Le numéro de dossier est encerclé en haut à gauche du reçu, au-dessus d'un code-barres.",
"descriptive-text": "<strong>Exemple d'un reçu officiel et bordereau de cueillette. Le numéro de dossier est encerclé en haut à gauche du reçu, au-dessus d'un code-barres.</strong>",
"src": "/Receipt2_FR.png",
"title": "Exemple de reçu 2"
"alt": "Reçu officiel alternatif.",
"descriptive-text": "<strong>Exemple de reçu officiel. Le numéro de dossier est encerclé au centre du reçu.</strong>",
"src": "/receipt-2-fr.png",
"title": "Exemple 2 - Reçu officiel alternatif"
},
"receipt-image-3": {
"alt": "Un exemple de reçu officiel. Le numéro de référence est encerclé au centre du reçu, au-dessus d'un code-barres.",
"descriptive-text": "<strong>Un exemple de reçu officiel. Le numéro de référence est encerclé au centre du reçu, au-dessus d'un code-barres.</strong>",
"src": "/Receipt3_FR.png",
"title": "Exemple de reçu 3"
"alt": "Reçu officiel et bordereau de cueillette alternatif.",
"descriptive-text": "<strong>Exemple d'un reçu officiel et bordereau de cueillette. Le numéro de dossier est encerclé en haut à gauche du reçu, au-dessus d'un code-barres.</strong>",
"src": "/receipt-3-fr.png",
"title": "Exemple 3 - Reçu officiel et bordereau de cueillette alternatif"
},
"where-to-find": {
"header": "Où trouver votre numéro de référence",
Expand Down
0 public/Receipt3_EN.png → public/receipt-1-en.png
View file
File renamed without changes
0 public/Receipt3_FR.png → public/receipt-1-fr.png
View file
File renamed without changes
0 public/Receipt1_EN.png → public/receipt-2-en.png
View file
File renamed without changes
0 public/Receipt1_FR.png → public/receipt-2-fr.png
View file
File renamed without changes
0 public/Receipt2_EN.png → public/receipt-3-en.png
View file
File renamed without changes
0 public/Receipt2_FR.png → public/receipt-3-fr.png
View file
File renamed without changes
74 changes: 0 additions & 74 deletions src/pages/landing.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,6 @@ const Landing = () => {
>
<Trans i18nKey="receipt-image-1.descriptive-text" ns="landing" />
</ExampleImage>
<p>{t('receipt-1-will-find.text')}</p>
<ul className="mb-5 list-disc pl-10">
<li>{t('receipt-1-will-find.list.item-1')}</li>
<li>{t('receipt-1-will-find.list.item-2')}</li>
<li>{t('receipt-1-will-find.list.item-3')}</li>
<li>{t('receipt-1-will-find.list.item-4')}</li>
<li>{t('receipt-1-will-find.list.item-5')}</li>
<li>{t('receipt-1-will-find.list.item-6')}</li>
<li>{t('receipt-1-will-find.list.item-7')}</li>
<li>{t('receipt-1-will-find.list.item-8')}</li>
<li>{t('receipt-1-will-find.list.item-9')}</li>
<li>{t('receipt-1-will-find.list.item-10')}</li>
<li>{t('receipt-1-will-find.list.item-11')}</li>
</ul>
</div>
</Collapse>
<Collapse title={t('receipt-image-2.title')}>
Expand All @@ -93,41 +79,6 @@ const Landing = () => {
>
<Trans i18nKey="receipt-image-2.descriptive-text" ns="landing" />
</ExampleImage>
<p>{t('receipt-2-will-find.text')}</p>
<ul className="mb-5 list-disc pl-10">
<li>{t('receipt-2-will-find.list.item-1')}</li>
<li>{t('receipt-2-will-find.list.item-2')}</li>
<li>{t('receipt-2-will-find.list.item-3')}</li>
<li>{t('receipt-2-will-find.list.item-4')}</li>
<li>{t('receipt-2-will-find.list.item-5')}</li>
<li>{t('receipt-2-will-find.list.item-6')}</li>
<li>{t('receipt-2-will-find.list.item-7')}</li>
<li>{t('receipt-2-will-find.list.item-8')}</li>
<li>{t('receipt-2-will-find.list.item-9')}</li>
<li>{t('receipt-2-will-find.list.item-10')}</li>
<li>{t('receipt-2-will-find.list.item-11')}</li>
<li>{t('receipt-2-will-find.list.item-12')}</li>
</ul>
<p>{t('receipt-2-pickup-instructions.text')}</p>
<ul className="mb-5 list-disc pl-10">
<li>{t('receipt-2-pickup-instructions.list.item-1')}</li>
<li>
{t('receipt-2-pickup-instructions.list.item-2.text')}
<ul className="list-disc pl-10">
<li>
<Trans
i18nKey="receipt-2-pickup-instructions.list.item-2.list.item-1"
ns="landing"
/>
</li>
<li>
{t('receipt-2-pickup-instructions.list.item-2.list.item-2')}
</li>
</ul>
</li>
<li>{t('receipt-2-pickup-instructions.list.item-3')}</li>
<li>{t('receipt-2-pickup-instructions.list.item-4')}</li>
</ul>
</div>
</Collapse>
<Collapse title={t('receipt-image-3.title')}>
Expand All @@ -142,31 +93,6 @@ const Landing = () => {
>
<Trans i18nKey="receipt-image-3.descriptive-text" ns="landing" />
</ExampleImage>
<p>{t('receipt-3-will-find.text')}</p>
<ul className="mb-5 list-disc pl-10">
<li>{t('receipt-3-will-find.list.item-1')}</li>
<li>{t('receipt-3-will-find.list.item-2')}</li>
<li>{t('receipt-3-will-find.list.item-3')}</li>
<li>{t('receipt-3-will-find.list.item-4')}</li>
<li>{t('receipt-3-will-find.list.item-5')}</li>
<li>{t('receipt-3-will-find.list.item-6')}</li>
<li>{t('receipt-3-will-find.list.item-7')}</li>
<li>{t('receipt-3-will-find.list.item-8')}</li>
<li>{t('receipt-3-will-find.list.item-9')}</li>
<li>{t('receipt-3-will-find.list.item-10')}</li>
<li>{t('receipt-3-will-find.list.item-11')}</li>
<li>{t('receipt-3-will-find.list.item-12')}</li>
<li>{t('receipt-3-will-find.list.item-13')}</li>
<li>{t('receipt-3-will-find.list.item-14')}</li>
<li>{t('receipt-3-will-find.list.item-15')}</li>
</ul>
<p>{t('receipt-3-next-steps.text')}</p>
<ul className="mb-5 list-disc pl-10">
<li>{t('receipt-3-next-steps.list.item-1')}</li>
<li>{t('receipt-3-next-steps.list.item-2')}</li>
<li>{t('receipt-3-next-steps.list.item-3')}</li>
<li>{t('receipt-3-next-steps.list.item-4')}</li>
</ul>
</div>
</Collapse>
<h3 className="h3 mb-2 mt-8">{t('if-lost.header')}</h3>
Expand Down

0 comments on commit b905ff9

Please sign in to comment.