Skip to content

Commit

Permalink
[Copy] Change to sentence case; remove superfluous colons; update Eng…
Browse files Browse the repository at this point in the history
…lish and French copy (#12378)

* Update copy in English and French

* Update copy in French

* Remove dividingColon

* Remove unused var, import

* Update Label for department select input in the request form

* Fix French Heading for the request information section of the single search request view
  • Loading branch information
mnigh authored Dec 27, 2024
1 parent 8bc8b36 commit 6ef9044
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 91 deletions.
10 changes: 5 additions & 5 deletions apps/web/src/components/PoolCandidatesTable/tableMessages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const messages = defineMessages({
id: "/LGiVB",
},
candidateName: {
defaultMessage: "Candidate Name",
id: "p/Qp/u",
defaultMessage: "Candidate name",
id: "awEvCF",
description: "Title displayed on the Pool Candidates table name column.",
},
skillCount: {
Expand All @@ -23,10 +23,10 @@ const messages = defineMessages({
"Title displayed on the Pool Candidates table Current Location column.",
},
dateReceived: {
defaultMessage: "Date Received",
id: "3eNQnt",
defaultMessage: "Date received",
id: "fI0idr",
description:
"Title displayed on the Pool Candidates table Date Received column.",
"Title displayed on the Pool Candidates table Date received column.",
},
rowSelection: {
defaultMessage: "Row Selection",
Expand Down
7 changes: 0 additions & 7 deletions apps/web/src/components/SearchRequestFilters/FilterBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import isArray from "lodash/isArray";
import { ReactNode } from "react";

import { Maybe } from "@gc-digital-talent/graphql";
import { commonMessages } from "@gc-digital-talent/i18n";

interface FilterBlockProps {
title: string;
content?: Maybe<string | ReactNode> | Maybe<string[]>;
Expand Down Expand Up @@ -49,8 +47,6 @@ const FilterBlockContent = ({
};

const FilterBlock = ({ title, content }: FilterBlockProps) => {
const intl = useIntl();

return (
<div data-h2-padding="base(0, 0, x1, 0)">
<p
Expand All @@ -59,9 +55,6 @@ const FilterBlock = ({ title, content }: FilterBlockProps) => {
data-h2-font-weight="base(600)"
>
<span data-h2-display="base(inline)">{title}</span>
<span data-h2-display="base(none) p-tablet(inline)">
{intl.formatMessage(commonMessages.dividingColon)}
</span>
</p>
<FilterBlockContent content={content} />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ const ApplicantFilters = ({
<FilterBlock
title={intl.formatMessage({
defaultMessage:
"Conditions of employment / Operational requirements",
id: "cMsRgt",
"Conditions of employment or operational requirements",
id: "SNxTm+",
description:
"Title for operational requirements section on summary of filters section",
})}
Expand Down Expand Up @@ -430,8 +430,8 @@ const SearchRequestFilters = ({
<FilterBlock
title={intl.formatMessage({
defaultMessage:
"Conditions of employment / Operational requirements",
id: "cMsRgt",
"Conditions of employment or operational requirements",
id: "SNxTm+",
description:
"Title for operational requirements section on summary of filters section",
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ const SearchRequestTable = ({ title }: SearchRequestTableProps) => {
id: "requestedDate",
enableColumnFilter: false,
header: intl.formatMessage({
defaultMessage: "Date Received",
id: "r2gD/4",
defaultMessage: "Date received",
id: "m0Qcow",
description:
"Title displayed on the search request table requested date column.",
}),
Expand Down
108 changes: 54 additions & 54 deletions apps/web/src/lang/fr.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ export const RequestForm = ({
id="department"
name="department"
label={intl.formatMessage({
defaultMessage: "Department / Hiring organization",
id: "P7ItrT",
defaultMessage: "Department or hiring organization",
id: "OgbLp1",
description:
"Label for department select input in the request form",
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ const AdvancedFilters = () => {
>
{intl.formatMessage({
defaultMessage:
"Conditions of employment / Operational requirements",
id: "laGCzG",
"Conditions of employment or operational requirements",
id: "H/zqKa",
description:
"Heading for operational requirements section of the search form.",
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ const UpdateSearchRequestForm = ({
<p data-h2-padding="base(x.5, 0, x.5, 0)">
{intl.formatMessage({
defaultMessage:
"These notes are available to all managers of this pool, but not to candidates.",
id: "VkBcGJ",
"These notes are only available here and will not be shared with the candidates.",
id: "t79/r1",
description:
"Description for the notes about this request section of the single search request view.",
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const ManagerInfo = ({
<>
<Heading level="h2" size="h4" data-h2-margin-top="base(0)">
{intl.formatMessage({
defaultMessage: "Manager Information",
id: "UEsexn",
defaultMessage: "Manager information",
id: "eyR6B+",
description:
"Heading for the manager info section of the single search request view.",
})}
Expand Down Expand Up @@ -91,8 +91,8 @@ const ManagerInfo = ({
/>
<FilterBlock
title={intl.formatMessage({
defaultMessage: "Government Email",
id: "d3oN4p",
defaultMessage: "Government email",
id: "wLVo1I",
description:
"Title for the government email block in the manager info section of the single search request view.",
})}
Expand Down Expand Up @@ -137,8 +137,8 @@ const ManagerInfo = ({
>
<FilterBlock
title={intl.formatMessage({
defaultMessage: "Date Received",
id: "r2gD/4",
defaultMessage: "Date received",
id: "m0Qcow",
description:
"Title displayed on the search request table requested date column.",
})}
Expand Down Expand Up @@ -498,8 +498,8 @@ export const ViewSearchRequest = ({
<div>
<Heading level="h2" size="h4">
{intl.formatMessage({
defaultMessage: "Request Information",
id: "AAmd5G",
defaultMessage: "Request information",
id: "/3mqz9",
description:
"Heading for the request information section of the single search request view.",
})}
Expand Down Expand Up @@ -563,8 +563,8 @@ export const ViewSearchRequest = ({
<div>
<Heading level="h2" size="h4">
{intl.formatMessage({
defaultMessage: "Candidate Results",
id: "Duswz0",
defaultMessage: "Candidate results",
id: "bQ4iDW",
description:
"Heading for the candidate results section of the single search request view.",
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,10 @@ const UserTable = ({ title }: UserTableProps) => {
{
id: "candidateName",
header: intl.formatMessage({
defaultMessage: "Candidate Name",
id: "NeNnAP",
defaultMessage: "Candidate name",
id: "uLncuU",
description:
"Title displayed on the User table Candidate Name column.",
"Title displayed on the User table Candidate name column.",
}),
cell: ({ row: { original: user } }) =>
getFullNameHtml(user.firstName, user.lastName, intl),
Expand Down

0 comments on commit 6ef9044

Please sign in to comment.