Merge branch 'develop' into pr-preview-4

git merge
DTS-STN · Jun 10, 2024 · 174a18b · 174a18b
2 parents f62be35 + 04bb4c5
commit 174a18b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/i18n/api/fr.ts b/i18n/api/fr.ts
@@ -338,7 +338,7 @@ const fr: Translations = {
     futureEligible60:
       'Vous serez probablement admissible lorsque vous aurez 60 ans.',
     futureEligible:
-      'Vous serez probablement admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE} ans.',
+      'Vous serez probablement admissible lorsque vous aurez {EARLIEST_ELIGIBLE_AGE}.',
     eligibleIncomeTooHigh:
       'Vous êtes probablement admissible à cette prestation, mais votre revenu est trop élevé pour recevoir un paiement mensuel pour le moment.',
     futureEligibleIncomeTooHigh:

diff --git a/utils/api/definitions/textReplacementRules.ts b/utils/api/definitions/textReplacementRules.ts
@@ -96,7 +96,7 @@ export const textReplacementRules: TextReplacementRules = {
       ? handler.fields.translations.incomeCombined
       : handler.fields.translations.incomeSingle,
   EARLIEST_ELIGIBLE_AGE: (handler) =>
-    getEligibleAgeWithMonths(handler.rawInput.age),
+    getEligibleAgeWithMonths(handler.rawInput.age, handler.rawInput._language),
   LINK_SERVICE_CANADA: (handler) =>
     generateLink(handler.fields.translations.links.SC),
   MY_SERVICE_CANADA: (handler) =>
@@ -135,15 +135,17 @@ export function generateLink(link: Link, opensNewWindow?: string): string {
   return `<a class="underline text-default-text generatedLink" href="${link.url}" target="_blank">${link.text}</a>`
 }
 
-export function getEligibleAgeWithMonths(age: number) {
+export function getEligibleAgeWithMonths(age: number, language: string) {
   if (Number.isInteger(age)) {
     return age.toString()
   }
 
   const years = Math.floor(age)
   const months = Math.round((age - years) * 12)
 
-  return `${years} years and ${months} months`
+  return language === 'en'
+    ? `${years}&nbsp;years and ${months}&nbsp;months`
+    : `${years}&nbsp;ans et ${months}&nbsp;mois`
 }
 
 export function getMaxYear(): number {