implemented latest EN updates (#265)

jonathan-lewis-esdc · web-flow · commit 040f505fc69d · 2025-04-29T11:14:28.000-03:00
* implemented latest EN updates
diff --git a/frontend/app/.server/locales/estimator-en.json b/frontend/app/.server/locales/estimator-en.json
@@ -8,30 +8,30 @@
           "invalid": "Your <abbr>UCCB</abbr> and <abbr>RDSP</abbr> income is invalid"
         },
         "info-label": "Information",
-        "label": "Your Universal Child Care Benefit (<abbr>UCCB</abbr>) and Registered Disability Savings Plan (<abbr>RDSP</abbr>) income"
+        "label": "Enter your Universal Child Care Benefit (<abbr>UCCB</abbr>) and Registered Disability Savings Plan (<abbr>RDSP</abbr>) income."
       },
       "claimed-repayment": {
         "error": {
           "invalid": "Your <abbr>UCCB</abbr> and <abbr>RDSP</abbr> repayment is invalid"
         },
         "info-label": "Information",
-        "label": "Your Universal Child Care Benefit (<abbr>UCCB</abbr>) and Registered Disability Savings Plan (<abbr>RDSP</abbr>) repayment"
+        "label": "Enter your Universal Child Care Benefit (<abbr>UCCB</abbr>) and Registered Disability Savings Plan (<abbr>RDSP</abbr>) repayment."
       },
       "net-income": {
         "error": {
           "invalid": "Your net income is invalid",
           "required": "Your net income is required"
         },
         "info-label": "How to calculate your net income",
-        "label": "Your net income"
+        "label": "Enter your net income"
       },
       "partner": {
         "claimed-income": {
           "error": {
             "invalid": "Your partner's <abbr>UCCB</abbr> and <abbr>RDSP</abbr> income is invalid"
           },
           "info-label": "Information",
-          "label": "Your partner's Universal Child Care Benefit (<abbr>UCCB</abbr>) and Registered Disability Savings Plan (<abbr>RDSP</abbr>) income"
+          "label": "Enter your partner's Universal Child Care Benefit (<abbr>UCCB</abbr>) and Registered Disability Savings Plan (<abbr>RDSP</abbr>) income."
         },
         "claimed-repayment": {
           "error": {
@@ -46,15 +46,15 @@
             "required": "Your partner's net income is required"
           },
           "info-label": "How to calculate your partner's net income",
-          "label": "Your partner's net income"
+          "label": "Enter your partner's net income."
         },
         "working-income": {
           "error": {
             "invalid": "Your partner's working income is invalid",
             "required": "Your partner's working income is required"
           },
           "info-label": "How to calculate your partner's working income",
-          "label": "Your partner's working income"
+          "label": "Enter your partner's working income"
         }
       },
       "working-income": {
@@ -63,7 +63,7 @@
           "required": "Your working income is required"
         },
         "info-label": "How to calculate your working income",
-        "label": "Your working income"
+        "label": "Enter your working income"
       }
     },
     "form-instructions": {
@@ -76,12 +76,12 @@
       "partner-info": "Your partner's information"
     },
     "info": {
-      "claimed-income": "Income claimed by you (line 11700 and line 12500 of your tax return).",
-      "claimed-repayment": "Repayment claimed by you (line 21300 and line 23200 of your tax return).",
-      "net-income": "Line 23600 on your tax return.",
-      "partner-claimed-income": "Income claimed by your partner (line 11700 and line 12500 of their tax return).",
-      "partner-claimed-repayment": "Repayment claimed by your partner (line 21300 and line 23200 of their tax return).",
-      "partner-net-income": "Line 23600 on your partner's tax return.",
+      "claimed-income": "To calculate this amount, add line 11700 and line 12500 of your {{year}} tax return.",
+      "claimed-repayment": "To calculate this amount, add line 21300 and line 23200 of your {{year}} tax return.",
+      "net-income": "This is found on line 23600 of your {{year}} tax return.",
+      "partner-claimed-income": "To calculate this amount, add line 11700 and line 12500 of your partner's {{year}} tax return.",
+      "partner-claimed-repayment": "To calculate this amount, add line 21300 and line 23200 of your partner's {{year}} tax return.",
+      "partner-net-income": "This is found on line 23600 of your partner's {{year}} tax return.",
       "working-income": {
         "items": [
           "Employment income (line 10100)",
diff --git a/frontend/app/.server/locales/estimator-fr.json b/frontend/app/.server/locales/estimator-fr.json
@@ -23,7 +23,7 @@
           "required": "Votre revenu net est requis"
         },
         "info-label": "Comment calculer votre revenu net ?",
-        "label": "Votre revenu net"
+        "label": "Entrez votre revenu net"
       },
       "partner": {
         "claimed-income": {
@@ -63,22 +63,22 @@
           "required": "Votre revenu d'emploi est requis"
         },
         "info-label": "Comment calculer votre revenu d'emploi ?",
-        "label": "Votre revenu d'emploi"
+        "label": "Entrez votre revenu d'emploi"
       }
     },
     "form-instructions": {
       "married": "Pour estimer vos prestations, nous aurons besoin des renseignements figurant sur votre <strong>déclaration de revenus de {{year}}</strong> ainsi que sur celle de votre partenaire.",
-      "single": "Pour estimer vos prestations, nous aurons besoin des renseignements figurant sur votre <strong>déclaration de revenus de {{year}}</strong>.",
-      "note": "Si un montant total est négatif ou égal à zéro, inscrivez '0'."
+      "single": "Pour estimer vos prestations, nous aurons besoin des renseignements suivants de votre <strong>déclaration de revenus de {{year}}</strong>.",
+      "note": "Si un des montants est négatif ou nul, entrez '0'."
     },
     "heading": {
-      "your-info": "Votre information",
-      "partner-info": "L'information de votre partenaire"
+      "your-info": "Votre information\u00A0:",
+      "partner-info": "L'information de votre partenaire\u00A0:"
     },
     "info": {
       "claimed-income": "Revenu déclaré par vous (lignes 11700 et 12500 de votre déclaration de revenus).",
       "claimed-repayment": "Remboursement déclaré par vous (lignes 21300 et 23200 de votre déclaration de revenus).",
-      "net-income": "Ligne 23600 de votre déclaration.",
+      "net-income": "Il se trouve à la ligne 23600 de votre déclaration de revenus {{year}}.",
       "partner-claimed-income": "Revenu déclaré par votre conjoint (ligne 11700 et ligne 12500 de leur déclaration de revenus).",
       "partner-claimed-repayment": "Remboursement déclaré par votre conjoint (ligne 21300 et ligne 23200 de leur déclaration de revenus).",
       "partner-net-income": "Ligne 23600 de la déclaration de revenus de votre conjoint.",
diff --git a/frontend/app/routes/estimator/step-income.tsx b/frontend/app/routes/estimator/step-income.tsx
@@ -183,15 +183,17 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
               )}
             </p>
             <p>{t('estimator:income.form-instructions.note')}</p>
-            <h2 className="font-lato mb-4 text-2xl font-bold">{t('estimator:income.heading.your-info')}</h2>
+            {loaderData.isMarried && (
+              <h2 className="font-lato mb-4 text-2xl font-bold">{t('estimator:income.heading.your-info')}</h2>
+            )}
             <CurrencyField
               name="individual-net-income"
               label={t('estimator:income.fields.net-income.label')}
               required
               helpMessagePrimaryClassName="-max-w-prose text-black"
               helpMessagePrimary={
                 <p>
-                  <Trans i18nKey={'estimator:income.info.net-income'} />
+                  <Trans i18nKey={'estimator:income.info.net-income'} values={{ year: previousIncomeTaxReturnYear }} />
                 </p>
               }
               defaultValue={
@@ -255,7 +257,7 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
               helpMessagePrimaryClassName="-max-w-prose text-black"
               helpMessagePrimary={
                 <p>
-                  <Trans i18nKey={'estimator:income.info.claimed-income'} />
+                  <Trans i18nKey={'estimator:income.info.claimed-income'} values={{ year: previousIncomeTaxReturnYear }} />
                 </p>
               }
               defaultValue={
@@ -275,7 +277,7 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
               helpMessagePrimaryClassName="-max-w-prose text-black"
               helpMessagePrimary={
                 <p>
-                  <Trans i18nKey={'estimator:income.info.claimed-repayment'} />
+                  <Trans i18nKey={'estimator:income.info.claimed-repayment'} values={{ year: previousIncomeTaxReturnYear }} />
                 </p>
               }
               defaultValue={
@@ -300,7 +302,10 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
                   helpMessagePrimaryClassName="-max-w-prose text-black"
                   helpMessagePrimary={
                     <p>
-                      <Trans i18nKey={'estimator:income.info.partner-net-income'} />
+                      <Trans
+                        i18nKey={'estimator:income.info.partner-net-income'}
+                        values={{ year: previousIncomeTaxReturnYear }}
+                      />
                     </p>
                   }
                   defaultValue={
@@ -365,7 +370,10 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
                   helpMessagePrimaryClassName="-max-w-prose text-black"
                   helpMessagePrimary={
                     <p>
-                      <Trans i18nKey={'estimator:income.info.partner-claimed-income'} />
+                      <Trans
+                        i18nKey={'estimator:income.info.partner-claimed-income'}
+                        values={{ year: previousIncomeTaxReturnYear }}
+                      />
                     </p>
                   }
                   defaultValue={
@@ -387,7 +395,10 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
                   helpMessagePrimaryClassName="-max-w-prose text-black"
                   helpMessagePrimary={
                     <p>
-                      <Trans i18nKey={'estimator:income.info.partner-claimed-repayment'} />
+                      <Trans
+                        i18nKey={'estimator:income.info.partner-claimed-repayment'}
+                        values={{ year: previousIncomeTaxReturnYear }}
+                      />
                     </p>
                   }
                   defaultValue={
diff --git a/frontend/e2e/__snapshots__/estimator/step-income.spec.ts/Navigating-to-en-income-renders-the-english-income-page-1.txt b/frontend/e2e/__snapshots__/estimator/step-income.spec.ts/Navigating-to-en-income-renders-the-english-income-page-1.txt
@@ -17,17 +17,16 @@
           your <strong>2024 tax return</strong>
         </p>
         <p>If any total amounts are negative or zero, enter '0'.</p>
-        <h2 class="font-lato mb-4 text-2xl font-bold">Your information</h2>
         <div id="input-text-field-«Rhmlj5»" class="space-y-2">
           <label class="block" id="input-text-field-«Rhmlj5»-label"
-            ><span class="font-semibold">Your net income</span></label
+            ><span class="font-semibold">Enter your net income</span></label
           >
           <div
             class="-max-w-prose text-black"
             data-testid="input-help"
             id="input-text-field-«Rhmlj5»-help-primary"
           >
-            <p>Line 23600 on your tax return.</p>
+            <p>This is found on line 23600 of your 2024 tax return.</p>
           </div>
           <span class="mr-1">$</span
           ><input
@@ -47,7 +46,7 @@
         </div>
         <div id="input-text-field-«Rlmlj5»" class="space-y-2">
           <label class="block" id="input-text-field-«Rlmlj5»-label"
-            ><span class="font-semibold">Your working income</span></label
+            ><span class="font-semibold">Enter your working income</span></label
           >
           <div
             class="-max-w-prose text-black"
@@ -128,9 +127,9 @@
         <div id="input-text-field-«Rpmlj5»" class="space-y-2">
           <label class="block" id="input-text-field-«Rpmlj5»-label"
             ><span class="font-semibold"
-              >Your Universal Child Care Benefit (<abbr>UCCB</abbr>) and
+              >Enter your Universal Child Care Benefit (<abbr>UCCB</abbr>) and
               Registered Disability Savings Plan (<abbr>RDSP</abbr>)
-              income</span
+              income.</span
             >
             <span aria-hidden="true">(<!-- -->optional<!-- -->)</span></label
           >
@@ -140,8 +139,8 @@
             id="input-text-field-«Rpmlj5»-help-primary"
           >
             <p>
-              Income claimed by you (line 11700 and line 12500 of your tax
-              return).
+              To calculate this amount, add line 11700 and line 12500 of your
+              2024 tax return.
             </p>
           </div>
           <span class="mr-1">$</span
@@ -161,9 +160,9 @@
         <div id="input-text-field-«Rtmlj5»" class="space-y-2">
           <label class="block" id="input-text-field-«Rtmlj5»-label"
             ><span class="font-semibold"
-              >Your Universal Child Care Benefit (<abbr>UCCB</abbr>) and
+              >Enter your Universal Child Care Benefit (<abbr>UCCB</abbr>) and
               Registered Disability Savings Plan (<abbr>RDSP</abbr>)
-              repayment</span
+              repayment.</span
             >
             <span aria-hidden="true">(<!-- -->optional<!-- -->)</span></label
           >
@@ -173,8 +172,8 @@
             id="input-text-field-«Rtmlj5»-help-primary"
           >
             <p>
-              Repayment claimed by you (line 21300 and line 23200 of your tax
-              return).
+              To calculate this amount, add line 21300 and line 23200 of your
+              2024 tax return.
             </p>
           </div>
           <span class="mr-1">$</span
diff --git a/frontend/e2e/__snapshots__/estimator/step-income.spec.ts/Navigating-to-fr-revenus-renders-the-french-income-page-1.txt b/frontend/e2e/__snapshots__/estimator/step-income.spec.ts/Navigating-to-fr-revenus-renders-the-french-income-page-1.txt
@@ -16,20 +16,22 @@
       <div class="space-y-6">
         <p>
           Pour estimer vos prestations, nous aurons besoin des renseignements
-          figurant sur votre <strong>déclaration de revenus de 2024</strong>.
+          suivants de votre <strong>déclaration de revenus de 2024</strong>.
         </p>
-        <p>Si un montant total est négatif ou égal à zéro, inscrivez '0'.</p>
-        <h2 class="font-lato mb-4 text-2xl font-bold">Votre information</h2>
+        <p>Si un des montants est négatif ou nul, entrez '0'.</p>
         <div id="input-text-field-«Rhmlj5»" class="space-y-2">
           <label class="block" id="input-text-field-«Rhmlj5»-label"
-            ><span class="font-semibold">Votre revenu net</span></label
+            ><span class="font-semibold">Entrez votre revenu net</span></label
           >
           <div
             class="-max-w-prose text-black"
             data-testid="input-help"
             id="input-text-field-«Rhmlj5»-help-primary"
           >
-            <p>Ligne 23600 de votre déclaration.</p>
+            <p>
+              Il se trouve à la ligne 23600 de votre déclaration de revenus
+              2024.
+            </p>
           </div>
           <input
             aria-describedby="input-text-field-«Rhmlj5»-help-primary"
@@ -48,7 +50,9 @@
         </div>
         <div id="input-text-field-«Rlmlj5»" class="space-y-2">
           <label class="block" id="input-text-field-«Rlmlj5»-label"
-            ><span class="font-semibold">Votre revenu d'emploi</span></label
+            ><span class="font-semibold"
+              >Entrez votre revenu d'emploi</span
+            ></label
           >
           <div
             class="-max-w-prose text-black"
