From a1204ff0ce6c5fc29afbda8b1e3fd9cee3b27fcb Mon Sep 17 00:00:00 2001 From: Brian Muenzenmeyer Date: Thu, 27 Nov 2025 06:30:27 -0600 Subject: [PATCH 1/3] use full word previous within crosslink --- packages/i18n/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/i18n/src/locales/en.json b/packages/i18n/src/locales/en.json index 02e84aae48a11..2fbc4aa176b88 100644 --- a/packages/i18n/src/locales/en.json +++ b/packages/i18n/src/locales/en.json @@ -251,7 +251,7 @@ "navigateToHome": "Navigate to Home" }, "crossLink": { - "previous": "Prev", + "previous": "Previous", "next": "Next" }, "codebox": { From 2f43f429a59ed8b66da8f3d55244bbd3239f6be1 Mon Sep 17 00:00:00 2001 From: Brian Muenzenmeyer Date: Thu, 27 Nov 2025 06:50:15 -0600 Subject: [PATCH 2/3] remove half used pagination keys in favor of common pagination --- apps/site/components/Common/Pagination.tsx | 4 ++-- packages/i18n/src/locales/en.json | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/site/components/Common/Pagination.tsx b/apps/site/components/Common/Pagination.tsx index 9d23f009581fb..a7f5f2d6a73fb 100644 --- a/apps/site/components/Common/Pagination.tsx +++ b/apps/site/components/Common/Pagination.tsx @@ -16,9 +16,9 @@ const Pagination: FC< labels={{ aria: t('components.common.pagination.defaultLabel'), prevAria: t('components.common.pagination.prevAriaLabel'), - prev: t('components.pagination.previous'), + prev: t('components.common.pagination.prev'), nextAria: t('components.common.pagination.nextAriaLabel'), - next: t('components.pagination.next'), + next: t('components.common.pagination.next'), }} getPageLabel={pageNumber => t('components.common.pagination.pageLabel', { pageNumber }) diff --git a/packages/i18n/src/locales/en.json b/packages/i18n/src/locales/en.json index 2fbc4aa176b88..5434bdfd55ed4 100644 --- a/packages/i18n/src/locales/en.json +++ b/packages/i18n/src/locales/en.json @@ -237,10 +237,6 @@ "npmVersion": "npm version", "v8Version": "V8 version" }, - "pagination": { - "next": "Next", - "previous": "Previous" - }, "common": { "alertBox": { "info": "Info", From 1577fbbb4d797be4cb64abdcf532bda97648a4de Mon Sep 17 00:00:00 2001 From: Brian Muenzenmeyer Date: Thu, 27 Nov 2025 09:22:29 -0600 Subject: [PATCH 3/3] remove crossLink translation keys completely necessitates renaming the key in pagination due to dynamic reference in CrossLink --- apps/site/components/Common/CrossLink.tsx | 2 +- apps/site/components/Common/Pagination.tsx | 6 +++--- packages/i18n/src/locales/en.json | 8 ++------ .../Common/BasePagination/__tests__/index.test.jsx | 14 +++++++------- .../src/Common/BasePagination/index.stories.tsx | 6 +++--- .../src/Common/BasePagination/index.tsx | 12 ++++++------ 6 files changed, 22 insertions(+), 26 deletions(-) diff --git a/apps/site/components/Common/CrossLink.tsx b/apps/site/components/Common/CrossLink.tsx index e7f752e099f2a..80fcc42cc732a 100644 --- a/apps/site/components/Common/CrossLink.tsx +++ b/apps/site/components/Common/CrossLink.tsx @@ -10,7 +10,7 @@ const CrossLink: FC> = props => { const t = useTranslations(); return ( diff --git a/apps/site/components/Common/Pagination.tsx b/apps/site/components/Common/Pagination.tsx index a7f5f2d6a73fb..5c4f7715d44fc 100644 --- a/apps/site/components/Common/Pagination.tsx +++ b/apps/site/components/Common/Pagination.tsx @@ -15,9 +15,9 @@ const Pagination: FC< as={Link} labels={{ aria: t('components.common.pagination.defaultLabel'), - prevAria: t('components.common.pagination.prevAriaLabel'), - prev: t('components.common.pagination.prev'), - nextAria: t('components.common.pagination.nextAriaLabel'), + previousAriaLabel: t('components.common.pagination.previousAriaLabel'), + previous: t('components.common.pagination.previous'), + nextAriaLabel: t('components.common.pagination.nextAriaLabel'), next: t('components.common.pagination.next'), }} getPageLabel={pageNumber => diff --git a/packages/i18n/src/locales/en.json b/packages/i18n/src/locales/en.json index 5434bdfd55ed4..3806262d5f0cb 100644 --- a/packages/i18n/src/locales/en.json +++ b/packages/i18n/src/locales/en.json @@ -246,17 +246,13 @@ "breadcrumbs": { "navigateToHome": "Navigate to Home" }, - "crossLink": { - "previous": "Previous", - "next": "Next" - }, "codebox": { "copy": "Copy to clipboard", "copied": "Copied to clipboard!" }, "pagination": { - "prev": "Previous", - "prevAriaLabel": "Previous page", + "previous": "Previous", + "previousAriaLabel": "Previous page", "next": "Next", "nextAriaLabel": "Next page", "defaultLabel": "Pagination", diff --git a/packages/ui-components/src/Common/BasePagination/__tests__/index.test.jsx b/packages/ui-components/src/Common/BasePagination/__tests__/index.test.jsx index adab757052d3d..a960f94e176aa 100644 --- a/packages/ui-components/src/Common/BasePagination/__tests__/index.test.jsx +++ b/packages/ui-components/src/Common/BasePagination/__tests__/index.test.jsx @@ -11,9 +11,9 @@ import BasePagination from '#ui/Common/BasePagination'; const getPageLabel = number => number.toString(); const labels = { aria: 'Aria', - prevAria: 'Previous Aria', - prev: 'Previous', - nextAria: 'Next Aria', + previousAriaLabel: 'Previous Aria', + previous: 'Previous', + nextAriaLabel: 'Next Aria', next: 'Next', }; @@ -51,14 +51,14 @@ describe('Pagination', () => { assert.ok( isVisible( screen.getByRole('button', { - name: labels.prevAria, + name: labels.previousAriaLabel, }) ) ); assert.ok( isVisible( screen.getByRole('button', { - name: labels.nextAria, + name: labels.nextAriaLabel, }) ) ); @@ -157,7 +157,7 @@ describe('Pagination', () => { assert.ok( screen .getByRole('button', { - name: labels.prevAria, + name: labels.previousAriaLabel, }) .getAttribute('aria-disabled') ); @@ -172,7 +172,7 @@ describe('Pagination', () => { assert.ok( screen .getByRole('button', { - name: labels.nextAria, + name: labels.nextAriaLabel, }) .getAttribute('aria-disabled') ); diff --git a/packages/ui-components/src/Common/BasePagination/index.stories.tsx b/packages/ui-components/src/Common/BasePagination/index.stories.tsx index bb1d86894a140..e45189ec7dfb1 100644 --- a/packages/ui-components/src/Common/BasePagination/index.stories.tsx +++ b/packages/ui-components/src/Common/BasePagination/index.stories.tsx @@ -13,9 +13,9 @@ export const Default: Story = { getPageLabel: value => `Page: ${value}`, labels: { aria: 'Aria', - prevAria: 'Previous Aria', - prev: 'Previous', - nextAria: 'Next Aria', + previousAriaLabel: 'Previous Aria', + previous: 'Previous', + nextAriaLabel: 'Next Aria', next: 'Next', }, }, diff --git a/packages/ui-components/src/Common/BasePagination/index.tsx b/packages/ui-components/src/Common/BasePagination/index.tsx index 21fb8e78988c1..ab72d5bf7e901 100644 --- a/packages/ui-components/src/Common/BasePagination/index.tsx +++ b/packages/ui-components/src/Common/BasePagination/index.tsx @@ -21,9 +21,9 @@ export type PaginationProps = { getPageLabel: (pageNumber: number) => string; labels: { aria: string; - prevAria: string; - prev: string; - nextAria: string; + previousAriaLabel: string; + previous: string; + nextAriaLabel: string; next: string; }; }; @@ -48,21 +48,21 @@ const BasePagination: FC = ({