[Copy] Consolidates duplicate strings (#8899)

* Consolidate Employment equity * Consolidate No information has been provided. * Consolidate Edit team information * Consolidate Browse jobs * Consolidate Find talent * Consolidate Personal and contact information * Consolidate Edit {label} * Consolidate Archive this pool * Consolidate Minimum experience or equivalent education * Consolidate What tasks or activities did you do that relate to this skill? * Consolidate Saving... * Consolidate Check out the most recent manager recruitment processes for specific opportunities or apply to ongoing recruitment in any of the IT generic work streams. Check back often for new opportunities. * Consolidate I am currently active in this role * Consolidate I'm interested in gaining hiring experience * Consolidate <strong>Yes</strong>, I am a Government of Canada employee. * Consolidate Bilingual positions (English and French) * Fix French Colombie-Britannique * Consolidate Save changes * Consolidate Skill requirements * Consolidate Telephone * Consolidate Indigenous * Consolidate These notes are shared between all managers of this pool, but not to candidates. * Consolidate Stream * Remove orphans Stream * Consolidate Language requirement * Consolidate Security requirement * Consolidate Government employee information * Consolidate Error: updating skill failed * Consolidate More opportunities are coming soon! * Consolidate Pool information * Consolidate Optional technical skills * Consolidate General information * Consolidate Skill showcase * Consolidate Highlight additional details * Consolidate By submitting your signature (typing your full name), you are contributing to an honest and safe space for Indigenous Peoples to access these opportunities. * Consolidate Technical skill library * Consolidate Job title * Consolidate Managers community * Consolidate No name provided; All the following skills are optionally beneficial to the role, and demonstrating them might benefit you when being considered. * Consolidate Contact us * Consolidate Skill library * Consolidate Employment duration * Consolidate Team's short description (French) * Consolidate Team's short description (English) * Consolidate 2-year post-secondary * Consolidate Advertisement information * Update Archive translation * Consolidate Behavioural skill library * Consolidate Asset skills * Consolidate Create skill * Consolidate Edit experience * Consolidate Edit this section * Consolidate Education requirements * Consolidate Get hiring experience * Update Edit this section * Consolidate How much responsibility did you have in this role? * Consolidate "I understand that I am part of a community who trusts each other" * Consolidate Preferred spoken interview language * Consolidate Preferred written exam language * Consolidate Preferred written exam language sentence case * Consolidate Preferred spoken interview language sentence case * Consolidate Profile and applications * Consolidate Publishing group * Consolidate Review instructions * Consolidate Salary range * Consolidate Screening questions * Consolidate Select an experience * Consolidate Team information * Consolidate Veteran status * Consolidate Were there any special techniques or approaches that you used? * Consolidate What did you accomplish, create or deliver using this skill? * Consolidate Applied work experience * Consolidate experience type titles experienceTypeTitles same as experienceMessages * Consolidate Work experiences * Consolidate Work preferences * Consolidate Add an experience to your career timeline * Consolidate Minimum experience or equivalent education * Consolidate Full name * Consolidate Location * Update test * Update tests
GCTC-NTGC · Jan 3, 2024 · ebe1c7f · ebe1c7f
1 parent 7b5d9b7
commit ebe1c7f
Show file tree

Hide file tree

Showing 123 changed files with 749 additions and 1,616 deletions.
diff --git a/apps/e2e/cypress/e2e/talentsearch/search-workflows.cy.ts b/apps/e2e/cypress/e2e/talentsearch/search-workflows.cy.ts
@@ -294,7 +294,7 @@ describe("Talent Search Workflow Tests", () => {
      */
     cy.wait("@gqlgetPoolCandidateSearchRequestDataQuery");
 
-    cy.findByRole("textbox", { name: /Full Name/i }).type("Test Full Name");
+    cy.findByRole("textbox", { name: /Full name/i }).type("Test Full Name");
 
     cy.findByRole("textbox", { name: /Government e-mail/i }).type(
       "test@tbs-sct.gc.ca",

diff --git a/apps/e2e/cypress/e2e/talentsearch/submit-application-iap.cy.ts b/apps/e2e/cypress/e2e/talentsearch/submit-application-iap.cy.ts
@@ -259,7 +259,9 @@ describe("Submit Application for IAP Workflow Tests", () => {
     cy.expectToast(/Successfully updated your career timeline!/i);
 
     // Education experience page - step five
-    cy.findByRole("heading", { name: /Minimum experience or education/i })
+    cy.findByRole("heading", {
+      name: /Minimum experience or equivalent education/i,
+    })
       .should("exist")
       .and("be.visible");
     cy.findByRole("radio", {

diff --git a/apps/e2e/cypress/e2e/talentsearch/submit-application.cy.ts b/apps/e2e/cypress/e2e/talentsearch/submit-application.cy.ts
@@ -271,7 +271,9 @@ describe("Submit Application Workflow Tests", () => {
 
     // Education experience page - step four
     cy.wait("@gqlApplicationQuery");
-    cy.findByRole("heading", { name: /Minimum experience or education/i })
+    cy.findByRole("heading", {
+      name: /Minimum experience or equivalent education/i,
+    })
       .should("exist")
       .and("be.visible");
     cy.findByRole("heading", { name: /Step 4 of 7/i })

diff --git a/apps/web/src/components/AdminAboutUserSection/AdminAboutUserSection.tsx b/apps/web/src/components/AdminAboutUserSection/AdminAboutUserSection.tsx
@@ -3,6 +3,7 @@ import { useIntl } from "react-intl";
 
 import { Well } from "@gc-digital-talent/ui";
 import {
+  commonMessages,
   getArmedForcesStatusesAdmin,
   getCitizenshipStatusesAdmin,
 } from "@gc-digital-talent/i18n";
@@ -41,14 +42,7 @@ const AdminAboutUserSection = ({
           !lastName &&
           !citizenship &&
           armedForcesStatus === null && (
-            <p>
-              {intl.formatMessage({
-                defaultMessage: "No information has been provided.",
-                id: "/fv4O0",
-                description:
-                  "Message on Admin side when user not filled WorkPreferences section.",
-              })}
-            </p>
+            <p>{intl.formatMessage(commonMessages.noInformationProvided)}</p>
           )}
         {armedForcesStatus !== null && armedForcesStatus !== undefined && (
           <p>

diff --git a/apps/web/src/components/Dialog/IapContactDialog.tsx b/apps/web/src/components/Dialog/IapContactDialog.tsx
@@ -15,9 +15,8 @@ const IapContactDialog = () => {
 
   const title = intl.formatMessage({
     defaultMessage: "Contact us",
-    id: "k1rUj5",
-    description:
-      "Title for the contact dialog for the IT Apprenticeship Program for Indigenous Peoples application process",
+    id: "RIi/3q",
+    description: "Title for Contact us action",
   });
 
   return (

diff --git a/apps/web/src/components/EducationRequirements/EducationRequirements.tsx b/apps/web/src/components/EducationRequirements/EducationRequirements.tsx
@@ -230,8 +230,9 @@ const EducationRequirements = ({
                   })
                 : intl.formatMessage({
                     defaultMessage: "2-year post-secondary",
-                    id: "ZIwaDE",
-                    description: "Title for the education requirements",
+                    id: "TiIkSF",
+                    description:
+                      "Option for education requirement, 2-year post-secondary",
                   })}
             </Heading>
             <Text>

diff --git a/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx b/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx
@@ -3,6 +3,7 @@ import { useFormState } from "react-hook-form";
 import { useIntl } from "react-intl";
 
 import { Button, Dialog } from "@gc-digital-talent/ui";
+import { formMessages } from "@gc-digital-talent/i18n";
 
 interface DialogFooterProps {
   saveText?: string;
@@ -20,14 +21,7 @@ const DialogFooter = ({ saveText, disabled }: DialogFooterProps) => {
         color="secondary"
         disabled={disabled || isSubmitting}
       >
-        <span>
-          {saveText ||
-            intl.formatMessage({
-              defaultMessage: "Save changes",
-              id: "m8S3S/",
-              description: "Button text to submit employment equity form.",
-            })}
-        </span>
+        <span>{saveText || intl.formatMessage(formMessages.saveChanges)}</span>
       </Button>
       <Dialog.Close
         data-h2-align-self="base(center)"

diff --git a/apps/web/src/components/EmploymentEquity/dialogs/IndigenousDialog.tsx b/apps/web/src/components/EmploymentEquity/dialogs/IndigenousDialog.tsx
@@ -112,9 +112,9 @@ const IndigenousDialog = ({
                     {intl.formatMessage({
                       defaultMessage:
                         "By submitting your signature (typing your full name), you are contributing to an honest and safe space for Indigenous Peoples to access these opportunities.",
-                      id: "cVszq/",
+                      id: "7i+qEB",
                       description:
-                        "Sentence before signature space on the add indigenous identity dialog",
+                        "Disclaimer before signing Indigenous self-declaration form",
                     })}
                   </p>
                   <Input

diff --git a/apps/web/src/components/ExperienceFormFields/AdditionalDetails.tsx b/apps/web/src/components/ExperienceFormFields/AdditionalDetails.tsx
@@ -35,8 +35,8 @@ const AdditionalDetails = ({ experienceType }: AdditionalDetailsProps) => {
       >
         {intl.formatMessage({
           defaultMessage: "Highlight additional details",
-          id: "u+r0gl",
-          description: "Heading for the tasks section of the experience form",
+          id: "6v+j79",
+          description: "Title for additional details section",
         })}
       </Heading>
       <div>

diff --git a/apps/web/src/components/ExperienceFormFields/CommunityFields.tsx b/apps/web/src/components/ExperienceFormFields/CommunityFields.tsx
@@ -48,9 +48,8 @@ const CommunityFields = ({ labels }: SubExperienceFormProps) => {
             id="currentRole"
             label={intl.formatMessage({
               defaultMessage: "I am currently active in this role",
-              id: "wASF5V",
-              description:
-                "Label displayed on Community Experience form for current role input",
+              id: "mOx5K1",
+              description: "Label displayed for current role input",
             })}
             name="currentRole"
           />

diff --git a/apps/web/src/components/ExperienceFormFields/ExperienceHeading.tsx b/apps/web/src/components/ExperienceFormFields/ExperienceHeading.tsx
@@ -10,7 +10,7 @@ import PlusCircleIcon from "@heroicons/react/24/outline/PlusCircleIcon";
 
 import { Accordion, DefinitionList, Heading } from "@gc-digital-talent/ui";
 
-import { experienceTypeTitles } from "~/pages/Applications/ApplicationCareerTimelineAddPage/messages";
+import experienceMessages from "~/messages/experienceMessages";
 
 type AccordionStates = "learn-more" | "";
 
@@ -117,7 +117,7 @@ const ExperienceHeading = ({ edit }: ExperienceHeadingProps) => {
                 <DefinitionList.Root>
                   <DefinitionList.Item
                     Icon={BriefcaseIcon}
-                    title={intl.formatMessage(experienceTypeTitles.work)}
+                    title={intl.formatMessage(experienceMessages.work)}
                   >
                     {intl.formatMessage({
                       defaultMessage:
@@ -128,7 +128,7 @@ const ExperienceHeading = ({ edit }: ExperienceHeadingProps) => {
                   </DefinitionList.Item>
                   <DefinitionList.Item
                     Icon={BookOpenIcon}
-                    title={intl.formatMessage(experienceTypeTitles.education)}
+                    title={intl.formatMessage(experienceMessages.education)}
                   >
                     {intl.formatMessage({
                       defaultMessage:
@@ -140,7 +140,7 @@ const ExperienceHeading = ({ edit }: ExperienceHeadingProps) => {
                   </DefinitionList.Item>
                   <DefinitionList.Item
                     Icon={UserGroupIcon}
-                    title={intl.formatMessage(experienceTypeTitles.community)}
+                    title={intl.formatMessage(experienceMessages.community)}
                   >
                     {intl.formatMessage({
                       defaultMessage:
@@ -152,7 +152,7 @@ const ExperienceHeading = ({ edit }: ExperienceHeadingProps) => {
                   </DefinitionList.Item>
                   <DefinitionList.Item
                     Icon={LightBulbIcon}
-                    title={intl.formatMessage(experienceTypeTitles.personal)}
+                    title={intl.formatMessage(experienceMessages.personal)}
                   >
                     {intl.formatMessage({
                       defaultMessage:
@@ -164,7 +164,7 @@ const ExperienceHeading = ({ edit }: ExperienceHeadingProps) => {
                   </DefinitionList.Item>
                   <DefinitionList.Item
                     Icon={StarIcon}
-                    title={intl.formatMessage(experienceTypeTitles.award)}
+                    title={intl.formatMessage(experienceMessages.award)}
                   >
                     {intl.formatMessage({
                       defaultMessage:

diff --git a/apps/web/src/components/ExperienceFormFields/SelectExperience.tsx b/apps/web/src/components/ExperienceFormFields/SelectExperience.tsx
@@ -5,8 +5,8 @@ import { Heading } from "@gc-digital-talent/ui";
 import { Select } from "@gc-digital-talent/forms";
 import { errorMessages } from "@gc-digital-talent/i18n";
 
-import { experienceTypeTitles } from "~/pages/Applications/ApplicationCareerTimelineAddPage/messages";
 import { getExperienceFormLabels } from "~/utils/experienceUtils";
+import experienceMessages from "~/messages/experienceMessages";
 
 const SelectExperience = () => {
   const intl = useIntl();
@@ -32,23 +32,23 @@ const SelectExperience = () => {
         options={[
           {
             value: "work",
-            label: intl.formatMessage(experienceTypeTitles.work),
+            label: intl.formatMessage(experienceMessages.work),
           },
           {
             value: "education",
-            label: intl.formatMessage(experienceTypeTitles.education),
+            label: intl.formatMessage(experienceMessages.education),
           },
           {
             value: "community",
-            label: intl.formatMessage(experienceTypeTitles.community),
+            label: intl.formatMessage(experienceMessages.community),
           },
           {
             value: "personal",
-            label: intl.formatMessage(experienceTypeTitles.personal),
+            label: intl.formatMessage(experienceMessages.personal),
           },
           {
             value: "award",
-            label: intl.formatMessage(experienceTypeTitles.award),
+            label: intl.formatMessage(experienceMessages.award),
           },
         ]}
       />

diff --git a/apps/web/src/components/ExperienceFormFields/WorkFields.tsx b/apps/web/src/components/ExperienceFormFields/WorkFields.tsx
@@ -48,9 +48,8 @@ const WorkFields = ({ labels }: SubExperienceFormProps) => {
             id="currentRole"
             label={intl.formatMessage({
               defaultMessage: "I am currently active in this role",
-              id: "8i+lzm",
-              description:
-                "Label displayed on Work Experience form for current role input",
+              id: "mOx5K1",
+              description: "Label displayed for current role input",
             })}
             name="currentRole"
           />

diff --git a/apps/web/src/components/ExperienceSkillFormDialog/ExperienceSkillForm.tsx b/apps/web/src/components/ExperienceSkillFormDialog/ExperienceSkillForm.tsx
@@ -149,14 +149,14 @@ const ExperienceSkillForm = ({
           disabled={!!defaultValues.experience}
           label={intl.formatMessage({
             defaultMessage: "Select an experience",
-            id: "ODZmvO",
-            description: "Label for the experience select input",
+            id: "baAj/Z",
+            description: "Title for select an experience action",
           })}
           rules={{ required: intl.formatMessage(errorMessages.required) }}
           nullSelection={intl.formatMessage({
             defaultMessage: "Select an experience",
-            id: "WP7NTc",
-            description: "Placeholder for selecting an experience",
+            id: "baAj/Z",
+            description: "Title for select an experience action",
           })}
           options={experiences.map((experienceOption) => ({
             value: experienceOption.id,
@@ -196,32 +196,32 @@ const ExperienceSkillForm = ({
                     {intl.formatMessage({
                       defaultMessage:
                         "What did you accomplish, create or deliver using this skill?",
-                      id: "pV+oii",
-                      description: "Question 1 for clarifying skill details",
+                      id: "WEVxYV",
+                      description: "Question for clarifying skill details",
                     })}
                   </li>
                   <li>
                     {intl.formatMessage({
                       defaultMessage:
                         "What tasks or activities did you do that relate to this skill?",
-                      id: "3sXEjF",
-                      description: "Question 2 for clarifying skill details",
+                      id: "ac1z9L",
+                      description: "Question about related tasks to a skill",
                     })}
                   </li>
                   <li>
                     {intl.formatMessage({
                       defaultMessage:
                         "Were there any special techniques or approaches that you used?",
-                      id: "e9fSNq",
-                      description: "Question 3 for clarifying skill details",
+                      id: "Ivvi/F",
+                      description: "Question about techniques used for a skill",
                     })}
                   </li>
                   <li>
                     {intl.formatMessage({
                       defaultMessage:
                         "How much responsibility did you have in this role?",
-                      id: "mQHftn",
-                      description: "Question 4 for clarifying skill details",
+                      id: "Qjpmm8",
+                      description: "Question for clarifying skill details",
                     })}
                   </li>
                 </ul>

diff --git a/apps/web/src/components/Footer/Footer.tsx b/apps/web/src/components/Footer/Footer.tsx
@@ -18,9 +18,9 @@ const Footer = ({ width }: FooterProps) => {
     {
       href: `/${intl.locale}/support`,
       children: intl.formatMessage({
-        defaultMessage: "Contact Us",
-        id: "AWiMVP",
-        description: "Label for the support link in the Footer.",
+        defaultMessage: "Contact us",
+        id: "RIi/3q",
+        description: "Title for Contact us action",
       }),
       state: { referrer: window.location.href },
     },

diff --git a/apps/web/src/components/Layout/Layout.tsx b/apps/web/src/components/Layout/Layout.tsx
@@ -9,7 +9,7 @@ import {
   ROLE_NAME,
   hasRole,
 } from "@gc-digital-talent/auth";
-import { useLocale } from "@gc-digital-talent/i18n";
+import { navigationMessages, useLocale } from "@gc-digital-talent/i18n";
 import { unpackMaybes } from "@gc-digital-talent/helpers";
 
 import SEO, { Favicon } from "~/components/SEO/SEO";
@@ -48,18 +48,10 @@ const Layout = () => {
       })}
     </MenuLink>,
     <MenuLink key="search" to={paths.search()}>
-      {intl.formatMessage({
-        defaultMessage: "Find talent",
-        id: "NohOkF",
-        description: "Label displayed on the Find talent menu item.",
-      })}
+      {intl.formatMessage(navigationMessages.findTalent)}
     </MenuLink>,
     <MenuLink key="browseJobs" to={paths.browsePools()}>
-      {intl.formatMessage({
-        defaultMessage: "Browse jobs",
-        id: "7GrHDl",
-        description: "Label displayed on the browse pools menu item.",
-      })}
+      {intl.formatMessage(navigationMessages.browseJobs)}
     </MenuLink>,
   ];
 
@@ -109,12 +101,7 @@ const Layout = () => {
           key="profile-applications"
           to={paths.profileAndApplications()}
         >
-          {intl.formatMessage({
-            defaultMessage: "Profile and applications",
-            id: "nBoNqj",
-            description:
-              "Label displayed on the profile and applications menu item.",
-          })}
+          {intl.formatMessage(navigationMessages.profileAndApplications)}
         </MenuLink>,
         ...authLinks,
       ];

diff --git a/apps/web/src/components/PoolCandidatesTable/PoolCandidateFilterDialog.tsx b/apps/web/src/components/PoolCandidatesTable/PoolCandidateFilterDialog.tsx
@@ -14,6 +14,7 @@ import {
 import { unpackMaybes } from "@gc-digital-talent/helpers";
 import {
   OperationalRequirementV2,
+  commonMessages,
   getCandidateExpiryFilterStatus,
   getCandidateSuspendedFilterStatus,
   getEmploymentEquityGroup,
@@ -128,11 +129,7 @@ const PoolCandidateFilterDialog = ({
         <Checklist
           idPrefix="equity"
           name="equity"
-          legend={intl.formatMessage({
-            defaultMessage: "Employment equity",
-            id: "9e6Xph",
-            description: "Label for the employment equity field",
-          })}
+          legend={intl.formatMessage(commonMessages.employmentEquity)}
           items={[
             equityOption("isWoman", getEmploymentEquityGroup("woman")),
             equityOption(