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 9d23f009581fb..5c4f7715d44fc 100644 --- a/apps/site/components/Common/Pagination.tsx +++ b/apps/site/components/Common/Pagination.tsx @@ -15,10 +15,10 @@ const Pagination: FC< as={Link} labels={{ aria: t('components.common.pagination.defaultLabel'), - prevAria: t('components.common.pagination.prevAriaLabel'), - prev: t('components.pagination.previous'), - nextAria: t('components.common.pagination.nextAriaLabel'), - next: t('components.pagination.next'), + 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 => t('components.common.pagination.pageLabel', { pageNumber }) diff --git a/packages/i18n/src/locales/en.json b/packages/i18n/src/locales/en.json index 02e84aae48a11..3806262d5f0cb 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", @@ -250,17 +246,13 @@ "breadcrumbs": { "navigateToHome": "Navigate to Home" }, - "crossLink": { - "previous": "Prev", - "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 = ({