Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(ui): preserve visible labels in accessible names (#44589)

ZengLiangliangbe57462a4011
diff --git a/packages/dify-ui/src/avatar/index.stories.tsx b/packages/dify-ui/src/avatar/index.stories.tsx
index 37c6bf9c466..f44110452ee 100644
--- a/packages/dify-ui/src/avatar/index.stories.tsx
+++ b/packages/dify-ui/src/avatar/index.stories.tsx
@@ -221,7 +221,7 @@ export const Collaborators: Story = {
<MenuTrigger
render={
<IconButton
- aria-label="View 4 collaborators"
+ aria-label="ES+2: View 4 collaborators"
variant="secondary"
size={null}
className="rounded-2xl bg-components-panel-bg-blur py-1 ps-1 pe-1.5 inset-ring-components-panel-border hover:bg-components-panel-bg hover:inset-ring-components-panel-border data-popup-open:bg-components-panel-bg"
@@ -258,7 +258,7 @@ export const Collaborators: Story = {
</div>
),
play: async ({ canvas, canvasElement, userEvent }) => {
- const trigger = canvas.getByRole('button', { name: 'View 4 collaborators' })
+ const trigger = canvas.getByRole('button', { name: 'ES+2: View 4 collaborators' })
trigger.focus()
await userEvent.keyboard('{Enter}')
const body = within(canvasElement.ownerDocument.body)
diff --git a/packages/dify-ui/src/date-time/README.md b/packages/dify-ui/src/date-time/README.md
index d55a52ae0cf..290a699bf73 100644
--- a/packages/dify-ui/src/date-time/README.md
+++ b/packages/dify-ui/src/date-time/README.md
@@ -60,7 +60,8 @@ Without a Label, name Trigger and Content explicitly using standard ARIA attribu
External text can name both parts through `aria-labelledby`; click forwarding remains with its
owner. Explicit names override the automatic Label association. When a Trigger references label
-text, its committed Value is appended to the name. An explicit `aria-label` supplies the whole name.
+text, its visible Value (including the empty placeholder) is appended to the name. An explicit
+`aria-label` supplies the whole name and must include the visible Value text.
Trigger's `aria-describedby` is combined with required and validation feedback. Do not rely on
placeholder or selected text alone to identify the field.
diff --git a/packages/dify-ui/src/date-time/__tests__/field.spec.tsx b/packages/dify-ui/src/date-time/__tests__/field.spec.tsx
index e556e6dc3f1..925e8bc920c 100644
--- a/packages/dify-ui/src/date-time/__tests__/field.spec.tsx
+++ b/packages/dify-ui/src/date-time/__tests__/field.spec.tsx
@@ -50,7 +50,7 @@ const families = [
},
async choose(screen: Awaited<ReturnType<typeof render>>) {
await screen
- .getByRole('button', { name: 'Thursday, January 16th, 2025', exact: true })
+ .getByRole('button', { name: '16: Thursday, January 16th, 2025', exact: true })
.click()
},
},
@@ -99,7 +99,7 @@ const families = [
},
async choose(screen: Awaited<ReturnType<typeof render>>) {
await screen
- .getByRole('button', { name: 'Thursday, January 16th, 2025', exact: true })
+ .getByRole('button', { name: '16: Thursday, January 16th, 2025', exact: true })
.click()
await screen.getByRole('button', { name: 'OK', exact: true }).click()
},
@@ -169,7 +169,7 @@ it.each(families)(
<button type="submit">Submit booking</button>
</Form>,
)
- const trigger = screen.getByRole('button', { name: 'Departure', exact: true })
+ const trigger = screen.getByRole('button', { name: /^Departure Select / })
await expect.element(trigger).not.toHaveAttribute('aria-invalid', 'true')
await screen.getByRole('button', { name: 'Submit booking' }).click()
expect(submitted).not.toHaveBeenCalled()
@@ -199,7 +199,7 @@ it.each(families)(
expect(stateOf(screen)).toMatchObject({ focused: true, dirty: false, touched: false })
const commitButton = screen
.getByRole('button', {
- name: family.name === 'DatePicker' ? 'Thursday, January 16th, 2025' : 'OK',
+ name: family.name === 'DatePicker' ? '16: Thursday, January 16th, 2025' : 'OK',
exact: true,
})
.element()
@@ -618,7 +618,7 @@ it('revalidates a required field after a committed selection', async () => {
await screen.getByRole('button', { name: 'Submit booking' }).click()
await expect.element(screen.getByText('Departure is required.', { exact: true })).toBeVisible()
expect(submitted).not.toHaveBeenCalled()
- await screen.getByRole('button', { name: 'Departure', exact: true }).click()
+ await screen.getByRole('button', { name: 'Departure Select date', exact: true }).click()
await userEvent.keyboard('{Enter}')
await expect
.element(screen.getByText('Departure is required.', { exact: true }))
@@ -681,7 +681,7 @@ it('keeps dirty tied to the committed controlled value when its owner declines r
await families[0]!.choose(screen)
await screen.getByRole('button', { name: 'Reset booking' }).click()
await expect.element(screen.getByRole('button', { name: 'Departure Jan 16, 2025' })).toBeVisible()
- expect(stateOf(screen)).toMatchObject({ dirty: true, touched: false })
+ await expect.poll(() => stateOf(screen)).toMatchObject({ dirty: true, touched: false })
expect(
new FormData(screen.getByRole('form', { name: 'Booking' }).element() as HTMLFormElement).get(
'departure',
@@ -711,7 +711,9 @@ it('clears reset feedback without removing required validation on the next submi
await screen.getByRole('button', { name: 'Submit booking' }).click()
expect(submitted).not.toHaveBeenCalled()
await expect.element(screen.getByText('Departure is required.', { exact: true })).toBeVisible()
- await expect.element(screen.getByRole('button', { name: 'Departure', exact: true })).toHaveFocus()
+ await expect
+ .element(screen.getByRole('button', { name: 'Departure Select date', exact: true }))
+ .toHaveFocus()
})
it('clears Field custom validity on reset and validates the restored value on the next submit', async () => {
@@ -758,7 +760,9 @@ it('integrates native invalid events with Field without marking an unchanged val
expect(submitted).not.toHaveBeenCalled()
await expect.element(screen.getByText('Departure is required.', { exact: true })).toBeVisible()
expect(stateOf(screen)).toMatchObject({ touched: true, dirty: false, valid: false })
- await expect.element(screen.getByRole('button', { name: 'Departure', exact: true })).toHaveFocus()
+ await expect
+ .element(screen.getByRole('button', { name: 'Departure Select date', exact: true }))
+ .toHaveFocus()
})
it('ignores a pending validation result after reset', async () => {
@@ -882,7 +886,9 @@ it('keeps Clear inside the field focus boundary while dismissing an open popup',
)
await screen.getByRole('button', { name: /^Departure / }).click()
await screen.getByLabelText('Clear departure', { exact: true }).click()
- await expect.element(screen.getByRole('button', { name: 'Departure', exact: true })).toHaveFocus()
+ await expect
+ .element(screen.getByRole('button', { name: 'Departure Select date', exact: true }))
+ .toHaveFocus()
expect(validate).not.toHaveBeenCalled()
expect(stateOf(screen)).toMatchObject({ touched: false, focused: true, filled: false })
})
diff --git a/packages/dify-ui/src/date-time/__tests__/label.spec.tsx b/packages/dify-ui/src/date-time/__tests__/label.spec.tsx
index 5990c95f68a..b5c5263467f 100644
--- a/packages/dify-ui/src/date-time/__tests__/label.spec.tsx
+++ b/packages/dify-ui/src/date-time/__tests__/label.spec.tsx
@@ -24,6 +24,7 @@ import { render } from 'vitest-browser-react'
const pickers = [
{
name: 'DatePicker',
+ placeholder: 'Select date',
wrap: (children: React.ReactNode) => <DatePicker>{children}</DatePicker>,
Label: DatePickerLabel,
Trigger: DatePickerTrigger,
@@ -31,6 +32,7 @@ const pickers = [
},
{
name: 'TimePicker',
+ placeholder: 'Select time',
wrap: (children: React.ReactNode) => <TimePicker>{children}</TimePicker>,
Label: TimePickerLabel,
Trigger: TimePickerTrigger,
@@ -38,6 +40,7 @@ const pickers = [
},
{
name: 'DateTimePicker',
+ placeholder: 'Select date and time',
wrap: (children: React.ReactNode) => <DateTimePicker timeZone="UTC">{children}</DateTimePicker>,
Label: DateTimePickerLabel,
Trigger: DateTimePickerTrigger,
@@ -47,7 +50,7 @@ const pickers = [
it.each(pickers)(
'$name label focuses only from its text and preserves a nested action',
- async ({ wrap, Label, Trigger, Content }) => {
+ async ({ wrap, Label, Trigger, Content, placeholder }) => {
const help = vi.fn()
const screen = await render(
wrap(
@@ -63,7 +66,7 @@ it.each(pickers)(
</React.Fragment>,
),
)
- const trigger = screen.getByRole('button', { name: 'Departure Help' })
+ const trigger = screen.getByRole('button', { name: `Departure Help ${placeholder}` })
await screen.getByText('Departure', { exact: true }).click()
await expect.element(trigger).toHaveFocus()
await expect.element(trigger).toHaveAttribute('aria-expanded', 'false')
diff --git a/packages/dify-ui/src/date-time/__tests__/localization.spec.tsx b/packages/dify-ui/src/date-time/__tests__/localization.spec.tsx
index d56e06910a2..ba63682d4f1 100644
--- a/packages/dify-ui/src/date-time/__tests__/localization.spec.tsx
+++ b/packages/dify-ui/src/date-time/__tests__/localization.spec.tsx
@@ -50,6 +50,9 @@ it.each([
await expect.element(trigger).toMatchTextContent(`${hour}:${minute}`)
await trigger.click()
await expect.element(screen.getByRole('gridcell', { selected: true })).toHaveTextContent(day)
+ await expect
+ .element(screen.getByRole('gridcell', { selected: true }).getByRole('button'))
+ .toHaveAccessibleName(new RegExp(`^${day}: `))
await screen.getByRole('button', { name: /Choose month and year:/ }).click()
await expect
.element(screen.getByRole('listbox', { name: 'Year' }).getByRole('option', { name: year }))
diff --git a/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx b/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx
index bbdafb23ee5..360205ea8f9 100644
--- a/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx
+++ b/packages/dify-ui/src/date-time/date-picker/__tests__/behavior.spec.tsx
@@ -66,7 +66,7 @@ describe('DatePicker keyboard and form contract', () => {
</DatePicker>,
)
await screen.getByText('Date', { exact: true }).click()
- const trigger = screen.getByRole('button', { name: 'Date', exact: true })
+ const trigger = screen.getByRole('button', { name: 'Date Select date', exact: true })
if (state === 'disabled') await expect.element(trigger).not.toHaveFocus()
else await expect.element(trigger).toHaveFocus()
await expect.element(trigger).toHaveAttribute('aria-expanded', 'false')
@@ -217,15 +217,17 @@ describe('DatePicker keyboard and form contract', () => {
)
await screen.getByRole('button', { name: 'Submit' }).click()
expect(submitted).not.toHaveBeenCalled()
- await expect.element(screen.getByRole('button', { name: 'Date', exact: true })).toHaveFocus()
+ await expect
+ .element(screen.getByRole('button', { name: 'Date Select date', exact: true }))
+ .toHaveFocus()
await expect.element(screen.getByRole('alert')).toHaveTextContent('Choose a date')
- await screen.getByRole('button', { name: 'Date', exact: true }).click()
+ await screen.getByRole('button', { name: 'Date Select date', exact: true }).click()
await userEvent.keyboard('{Enter}')
await screen.getByRole('button', { name: 'Submit' }).click()
expect(submitted).toHaveBeenCalledWith(expect.stringMatching(/^\d{4}-\d{2}-\d{2}$/))
await screen.getByRole('button', { name: 'Reset' }).click()
await expect
- .element(screen.getByRole('button', { name: 'Date', exact: true }))
+ .element(screen.getByRole('button', { name: 'Date Select date', exact: true }))
.toBeInTheDocument()
await expect.element(screen.getByRole('button', { name: 'Clear date' })).not.toBeInTheDocument()
})
@@ -256,7 +258,9 @@ describe('DatePicker keyboard and form contract', () => {
null,
expect.objectContaining({ reason: 'clear-press' }),
)
- await expect.element(screen.getByRole('button', { name: 'Date', exact: true })).toHaveFocus()
+ await expect
+ .element(screen.getByRole('button', { name: 'Date Select date', exact: true }))
+ .toHaveFocus()
await expect
.element(screen.getByRole('button', { name: 'Clear date' }))
.not.toBeInTheDocument()
@@ -296,7 +300,7 @@ it('moves across an adjacent month with the keyboard', async () => {
await screen.getByRole('button', { name: 'Date Jan 31, 2025' }).click()
await userEvent.keyboard('{ArrowRight}')
await expect
- .element(screen.getByRole('button', { name: 'Saturday, February 1st, 2025', exact: true }))
+ .element(screen.getByRole('button', { name: '1: Saturday, February 1st, 2025', exact: true }))
.toHaveFocus()
await expect.element(screen.getByRole('status')).toHaveTextContent('February 2025')
expect(
@@ -315,7 +319,7 @@ it('opens on the allowed month and retains a visible focus target if every date
<Parts />
</DatePicker>,
)
- await screen.getByRole('button', { name: 'Date', exact: true }).click()
+ await screen.getByRole('button', { name: 'Date Select date', exact: true }).click()
await expect
.element(screen.getByRole('button', { name: 'Choose month and year: February 2037' }))
.toHaveFocus()
@@ -348,7 +352,7 @@ it('keeps adjacent-month dates selectable by pointer', async () => {
</DatePicker>,
)
await screen.getByRole('button', { name: 'Date Jan 15, 2025' }).click()
- await screen.getByRole('button', { name: 'Saturday, February 1st, 2025', exact: true }).click()
+ await screen.getByRole('button', { name: '1: Saturday, February 1st, 2025', exact: true }).click()
await expect.element(screen.getByRole('button', { name: 'Date Feb 1, 2025' })).toHaveFocus()
})
@@ -363,19 +367,19 @@ it('supports month/year paging and week endpoints without committing during navi
await screen.getByRole('button', { name: 'Date Jan 31, 2025' }).click()
await userEvent.keyboard('{PageDown}')
await expect
- .element(screen.getByRole('button', { name: 'Friday, February 28th, 2025', exact: true }))
+ .element(screen.getByRole('button', { name: '28: Friday, February 28th, 2025', exact: true }))
.toHaveFocus()
await userEvent.keyboard('{Shift>}{PageDown}{/Shift}')
await expect
- .element(screen.getByRole('button', { name: 'Saturday, February 28th, 2026', exact: true }))
+ .element(screen.getByRole('button', { name: '28: Saturday, February 28th, 2026', exact: true }))
.toHaveFocus()
await userEvent.keyboard('{Home}')
await expect
- .element(screen.getByRole('button', { name: 'Sunday, February 22nd, 2026', exact: true }))
+ .element(screen.getByRole('button', { name: '22: Sunday, February 22nd, 2026', exact: true }))
.toHaveFocus()
await userEvent.keyboard('{End}')
await expect
- .element(screen.getByRole('button', { name: 'Saturday, February 28th, 2026', exact: true }))
+ .element(screen.getByRole('button', { name: '28: Saturday, February 28th, 2026', exact: true }))
.toHaveFocus()
expect(changed).not.toHaveBeenCalled()
})
@@ -391,7 +395,7 @@ it('localizes full dates and reverses horizontal calendar navigation in RTL', as
)
await screen.getByRole('button', { name: /^Date / }).click()
await userEvent.keyboard('{ArrowLeft}')
- const nextLabel = 'الخميس، 16 جانفي 2025'
+ const nextLabel = '16: الخميس، 16 جانفي 2025'
await expect.element(screen.getByRole('button', { name: nextLabel, exact: true })).toHaveFocus()
})
@@ -413,7 +417,9 @@ it('focuses the first invalid picker inside a native fieldset', async () => {
</form>,
)
await screen.getByRole('button', { name: 'Submit trip' }).click()
- await expect.element(screen.getByRole('button', { name: 'Departure', exact: true })).toHaveFocus()
+ await expect
+ .element(screen.getByRole('button', { name: 'Departure Select date', exact: true }))
+ .toHaveFocus()
})
it('keeps Persian month labels in the Gregorian calendar used by the value', async () => {
@@ -431,7 +437,7 @@ it('keeps Persian month labels in the Gregorian calendar used by the value', asy
.toHaveAttribute('aria-selected', 'true')
await screen.getByRole('option', { name: 'فوریه' }).click()
await screen.getByRole('button', { name: 'OK' }).click()
- const dateName = 'شنبه ۱۵ فوریه ۲۰۲۵'
+ const dateName = '۱۵: شنبه ۱۵ فوریه ۲۰۲۵'
await screen.getByRole('button', { name: dateName }).click()
expect(changed).toHaveBeenCalledExactlyOnceWith(
'2025-02-15',
diff --git a/packages/dify-ui/src/date-time/date-picker/__tests__/index.spec.tsx b/packages/dify-ui/src/date-time/date-picker/__tests__/index.spec.tsx
index 965908e33e5..37f950f2568 100644
--- a/packages/dify-ui/src/date-time/date-picker/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/date-time/date-picker/__tests__/index.spec.tsx
@@ -33,13 +33,13 @@ it('preserves localized today and selection semantics in the styled day button',
</DatePicker>,
)
await screen.getByRole('button', { name: /^Date / }).click()
- const today = screen.getByRole('button', { name: '今天,2026年9月28日 星期一,已选择' })
+ const today = screen.getByRole('button', { name: '28: 今天,2026年9月28日 星期一,已选择' })
await expect.element(today).toHaveAttribute('aria-current', 'date')
await expect.element(today).toHaveTextContent('28')
await expect.element(today).toHaveFocus()
await userEvent.keyboard('{ArrowRight}')
await expect
- .element(screen.getByRole('button', { name: '2026年9月29日 星期二' }))
+ .element(screen.getByRole('button', { name: '29: 2026年9月29日 星期二' }))
.not.toHaveAttribute('aria-current')
} finally {
vi.useRealTimers()
diff --git a/packages/dify-ui/src/date-time/date-picker/index.stories.tsx b/packages/dify-ui/src/date-time/date-picker/index.stories.tsx
index 7371e2cfd81..6f1afceaf8d 100644
--- a/packages/dify-ui/src/date-time/date-picker/index.stories.tsx
+++ b/packages/dify-ui/src/date-time/date-picker/index.stories.tsx
@@ -142,7 +142,7 @@ export const NativeForm: Story = {
play: async ({ canvasElement, userEvent }) => {
const canvas = within(canvasElement)
const body = within(canvasElement.ownerDocument.body)
- const trigger = canvas.getByRole('button', { name: 'Start date (required)' })
+ const trigger = canvas.getByRole('button', { name: 'Start date (required) Select date' })
await userEvent.click(canvas.getByRole('button', { name: 'Save' }))
await expect(canvas.queryByRole('status', { name: 'Submitted values' })).not.toBeInTheDocument()
await expect(trigger).toHaveFocus()
@@ -151,7 +151,7 @@ export const NativeForm: Story = {
/Choose a calendar date; no time zone is stored.*Choose a start date/,
)
for (const [label, name] of [
- ['Start date (required)', 'Start date (required)'],
+ ['Start date (required)', 'Start date (required) Select date'],
['Start time', /^Start time\b/],
['Reminder (UTC)', /^Reminder \(UTC\)/],
] as const) {
@@ -179,7 +179,7 @@ export const NativeForm: Story = {
reminder: '2025-01-15T13:30:00.000Z',
})
await userEvent.click(canvas.getByRole('button', { name: 'Reset' }))
- await waitFor(() => expect(trigger).toHaveAccessibleName('Start date (required)'))
+ await waitFor(() => expect(trigger).toHaveAccessibleName('Start date (required) Select date'))
await expect(trigger).not.toHaveAttribute('aria-invalid', 'true')
await expect(canvas.queryByRole('status', { name: 'Submitted values' })).not.toBeInTheDocument()
},
@@ -253,12 +253,12 @@ export const RTL: Story = {
await userEvent.click(trigger)
await body.findByRole('dialog', { name: 'Start date' })
await waitFor(() =>
- expect(body.getByRole('button', { name: /^الأربعاء، 15 جانفي 2025/ })).toHaveFocus(),
+ expect(body.getByRole('button', { name: /^15: الأربعاء، 15 جانفي 2025/ })).toHaveFocus(),
)
await userEvent.keyboard('{ArrowLeft}')
- await expect(body.getByRole('button', { name: 'الخميس، 16 جانفي 2025' })).toHaveFocus()
+ await expect(body.getByRole('button', { name: '16: الخميس، 16 جانفي 2025' })).toHaveFocus()
await userEvent.keyboard('{ArrowRight}')
- await expect(body.getByRole('button', { name: /^الأربعاء، 15 جانفي 2025/ })).toHaveFocus()
+ await expect(body.getByRole('button', { name: /^15: الأربعاء، 15 جانفي 2025/ })).toHaveFocus()
const heading = body.getByRole('button', { name: /Choose month and year:/ })
await userEvent.click(heading)
const months = await body.findByRole('listbox', { name: 'Month' })
@@ -358,11 +358,11 @@ export const FieldAndForm: Story = {
const page = within(canvasElement.ownerDocument.body)
await userEvent.click(canvas.getByRole('button', { name: 'Submit booking' }))
await expect(canvas.getByText('Choose a departure date.')).toBeVisible()
- const trigger = canvas.getByRole('button', { name: 'Departure date' })
+ const trigger = canvas.getByRole('button', { name: 'Departure date Select date' })
await expect(trigger).toHaveFocus()
await userEvent.click(trigger)
await userEvent.click(
- await page.findByRole('button', { name: 'Wednesday, January 15th, 2025' }),
+ await page.findByRole('button', { name: '15: Wednesday, January 15th, 2025' }),
)
await expect(canvas.getByLabelText('Last change')).toHaveTextContent('Date: item-press')
await userEvent.click(canvas.getByRole('button', { name: 'Departure time 1:30 PM' }))
@@ -377,7 +377,7 @@ export const FieldAndForm: Story = {
'{"departureDate":"2025-01-15","departureTime":"14:30","meetingInstant":"2025-01-15T18:30:00.000Z"}',
)
await userEvent.click(canvas.getByRole('button', { name: 'Reset booking' }))
- await expect(canvas.getByRole('button', { name: 'Departure date' })).toBeVisible()
+ await expect(canvas.getByRole('button', { name: 'Departure date Select date' })).toBeVisible()
await expect(canvas.getByRole('button', { name: 'Departure time 1:30 PM' })).toBeVisible()
await expect(canvas.queryByText('Choose a departure date.')).not.toBeInTheDocument()
},
diff --git a/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx b/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx
index 459767f794c..7c9e9813a83 100644
--- a/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/date-time/date-time-picker/__tests__/index.spec.tsx
@@ -60,8 +60,8 @@ it('keeps the natural calendar and month-picker height around a centered mobile
})
it.each([
- ['Tuesday, December 31st, 2024', 'December 2024', '2024-12-31'],
- ['Saturday, February 1st, 2025', 'February 2025', '2025-02-01'],
+ ['31: Tuesday, December 31st, 2024', 'December 2024', '2024-12-31'],
+ ['1: Saturday, February 1st, 2025', 'February 2025', '2025-02-01'],
])('navigates to %s on selection and commits only on OK', async (day, month, date) => {
const changed = vi.fn()
const screen = await render(
@@ -180,7 +180,7 @@ describe('DateTimePicker', () => {
)
await screen.getByRole('button', { name: 'Meeting Jan 15, 2025, 1:30 PM' }).click()
const selectedDay = screen.getByRole('button', {
- name: 'Wednesday, January 15th, 2025, selected',
+ name: '15: Wednesday, January 15th, 2025, selected',
})
await expect.element(selectedDay).toHaveFocus()
diff --git a/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx b/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx
index 6cfaf6e8323..ef6c6027489 100644
--- a/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx
+++ b/packages/dify-ui/src/date-time/date-time-picker/index.stories.tsx
@@ -55,7 +55,9 @@ export const Default: Story = {
})
await expect(trigger).toHaveAttribute('aria-expanded', 'false')
await userEvent.click(trigger)
- await userEvent.click(await body.findByRole('button', { name: 'Thursday, January 16th, 2025' }))
+ await userEvent.click(
+ await body.findByRole('button', { name: '16: Thursday, January 16th, 2025' }),
+ )
await expect(trigger).toHaveAccessibleName('Meeting time Jan 15, 2025, 1:30 PM')
await userEvent.click(body.getByRole('button', { name: /Pick Time:/ }))
const hours = within(await body.findByRole('listbox', { name: 'Hour' }))
diff --git a/packages/dify-ui/src/date-time/internal/calendar-grid.tsx b/packages/dify-ui/src/date-time/internal/calendar-grid.tsx
index 7fc7ee3f2ee..77761a41508 100644
--- a/packages/dify-ui/src/date-time/internal/calendar-grid.tsx
+++ b/packages/dify-ui/src/date-time/internal/calendar-grid.tsx
@@ -37,8 +37,16 @@ function fromCalendarDate(date: Date): string {
}
function StyledDayButton(props: React.ComponentProps<typeof DayButton>) {
+ // Keep the visible numeral independently addressable (e.g. 15, not only 15th),
+ // while retaining DayPicker's localized full date, today and selected labels.
+ // DayPicker supplies formatDay's string as children and labelDayButton's label.
+ const visibleDay = String(props.children)
return (
- <DayButton {...props} aria-current={props.modifiers.today ? 'date' : undefined}>
+ <DayButton
+ {...props}
+ aria-label={`${visibleDay}: ${props['aria-label']}`}
+ aria-current={props.modifiers.today ? 'date' : undefined}
+ >
{props.children}
{props.modifiers.today && !props.modifiers.selected && (
<span
diff --git a/packages/dify-ui/src/date-time/internal/picker-parts.tsx b/packages/dify-ui/src/date-time/internal/picker-parts.tsx
index aa196368e58..1e8d2a44909 100644
--- a/packages/dify-ui/src/date-time/internal/picker-parts.tsx
+++ b/packages/dify-ui/src/date-time/internal/picker-parts.tsx
@@ -501,11 +501,7 @@ function PickerTrigger({
<PopoverTrigger
id={triggerId}
aria-label={ariaLabel}
- aria-labelledby={
- labelId
- ? [labelId, field.serializedValue ? field.valueId : undefined].filter(Boolean).join(' ')
- : undefined
- }
+ aria-labelledby={labelId ? `${labelId} ${field.valueId}` : undefined}
{...getStateAttributesProps(
{
...baseField.state,
diff --git a/packages/dify-ui/src/pagination/__tests__/index.spec.tsx b/packages/dify-ui/src/pagination/__tests__/index.spec.tsx
index 4fb86988edb..94032a92c66 100644
--- a/packages/dify-ui/src/pagination/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/pagination/__tests__/index.spec.tsx
@@ -80,7 +80,7 @@ describe('Pagination primitive', () => {
await expect.element(screen.getByRole('button', { name: 'Previous page' })).toBeInTheDocument()
await expect.element(screen.getByRole('button', { name: 'Next page' })).toBeInTheDocument()
await expect
- .element(screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }))
+ .element(screen.getByRole('button', { name: '2/200: Edit page number' }))
.toHaveTextContent('2/200')
await expect
.element(screen.getByRole('button', { name: 'Page 2, current page' }))
@@ -165,7 +165,7 @@ describe('Pagination primitive', () => {
it('switches the page summary into a selected labelled number field', async () => {
const { screen } = await renderPagination()
- await screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }).click()
+ await screen.getByRole('button', { name: '2/200: Edit page number' }).click()
await expect.element(screen.getByRole('textbox', { name: 'Page number' })).toBeInTheDocument()
const input = asHTMLElement(
@@ -186,12 +186,12 @@ describe('Pagination primitive', () => {
it('returns to the summary button when the page input loses focus', async () => {
const { screen } = await renderPagination()
- await screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }).click()
+ await screen.getByRole('button', { name: '2/200: Edit page number' }).click()
await expect.element(screen.getByRole('textbox', { name: 'Page number' })).toBeInTheDocument()
asHTMLElement(screen.getByRole('textbox', { name: 'Page number' }).element()).blur()
await expect
- .element(screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }))
+ .element(screen.getByRole('button', { name: '2/200: Edit page number' }))
.toBeInTheDocument()
})
@@ -199,13 +199,13 @@ describe('Pagination primitive', () => {
{
name: 'Enter and restores summary focus',
key: 'Enter',
- focusedButton: 'Edit page number, current page 2 of 200',
+ focusedButton: '2/200: Edit page number',
},
{ name: 'Tab and moves focus forward', key: 'Tab', focusedButton: 'Next page' },
])('commits the edited page with $name', async ({ key, focusedButton }) => {
const { screen, onPageChange } = await renderPagination()
- await screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }).click()
+ await screen.getByRole('button', { name: '2/200: Edit page number' }).click()
const input = screen.getByRole('textbox', { name: 'Page number' })
await input.fill('7')
await expect.element(input).toHaveFocus()
@@ -233,7 +233,7 @@ describe('Pagination primitive', () => {
</React.Fragment>,
)
- await screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }).click()
+ await screen.getByRole('button', { name: '2/200: Edit page number' }).click()
const input = screen.getByRole('textbox', { name: 'Page number' })
await input.fill('7')
await expect.element(input).toHaveFocus()
@@ -247,14 +247,14 @@ describe('Pagination primitive', () => {
expect(onClick).toHaveBeenCalledOnce()
await expect.element(outsideButton).toHaveFocus()
await expect
- .element(screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }))
+ .element(screen.getByRole('button', { name: '2/200: Edit page number' }))
.toBeInTheDocument()
})
it('cancels the page input editing mode with Escape', async () => {
const { screen, onPageChange } = await renderPagination()
- await screen.getByRole('button', { name: 'Edit page number, current page 2 of 200' }).click()
+ await screen.getByRole('button', { name: '2/200: Edit page number' }).click()
const input = screen.getByRole('textbox', { name: 'Page number' })
await input.fill('7')
await expect.element(input).toHaveFocus()
@@ -262,7 +262,7 @@ describe('Pagination primitive', () => {
await userEvent.keyboard('{Escape}')
const summaryButton = screen.getByRole('button', {
- name: 'Edit page number, current page 2 of 200',
+ name: '2/200: Edit page number',
})
await expect.element(summaryButton).toBeInTheDocument()
await vi.waitFor(() => {
@@ -299,7 +299,7 @@ describe('Pagination primitive', () => {
)
await expect
- .element(screen.getByRole('button', { name: 'Edit page number, current page 2 of 10' }))
+ .element(screen.getByRole('button', { name: '2/10: Edit page number' }))
.toBeInTheDocument()
await expect
.element(screen.getByRole('radiogroup', { name: 'Items per page' }))
@@ -313,14 +313,13 @@ describe('Pagination primitive', () => {
totalPages={10}
onPageChange={vi.fn()}
labels={{
- editPageNumber: (page, totalPages) =>
- `Change page, current page ${page} of ${totalPages}`,
+ editPageNumber: (page, totalPages) => `${page}/${totalPages}: Change page`,
}}
/>,
)
await expect
- .element(screen.getByRole('button', { name: 'Change page, current page 2 of 10' }))
+ .element(screen.getByRole('button', { name: '2/10: Change page' }))
.toBeInTheDocument()
})
diff --git a/packages/dify-ui/src/pagination/index.stories.tsx b/packages/dify-ui/src/pagination/index.stories.tsx
index b1332d40f09..89ce8ee8b32 100644
--- a/packages/dify-ui/src/pagination/index.stories.tsx
+++ b/packages/dify-ui/src/pagination/index.stories.tsx
@@ -76,14 +76,10 @@ type Story = StoryObj<typeof meta>
export const Playground: Story = {
render: () => <PaginationDemo />,
play: async ({ canvas, userEvent }) => {
- await expect(
- canvas.getByRole('button', { name: 'Edit page number, current page 2 of 200' }),
- ).toBeVisible()
+ await expect(canvas.getByRole('button', { name: '2/200: Edit page number' })).toBeVisible()
await userEvent.click(canvas.getByRole('button', { name: 'Next page' }))
- await expect(
- canvas.getByRole('button', { name: 'Edit page number, current page 3 of 200' }),
- ).toBeVisible()
+ await expect(canvas.getByRole('button', { name: '3/200: Edit page number' })).toBeVisible()
await userEvent.click(canvas.getByRole('radio', { name: '50' }))
await expect(canvas.getByRole('radio', { name: '50' })).toHaveAttribute('aria-checked', 'true')
diff --git a/packages/dify-ui/src/pagination/index.tsx b/packages/dify-ui/src/pagination/index.tsx
index 4629afc5a97..2ca1154a3a6 100644
--- a/packages/dify-ui/src/pagination/index.tsx
+++ b/packages/dify-ui/src/pagination/index.tsx
@@ -380,9 +380,7 @@ function PaginationPageJump({
{...props}
ref={mergedSummaryRef}
type="button"
- aria-label={
- ariaLabel ?? `Edit page number, current page ${pagination.page} of ${pagination.totalPages}`
- }
+ aria-label={ariaLabel ?? `${pagination.page}/${pagination.totalPages}: Edit page number`}
className={(state) =>
cn(
'inline-flex h-7 touch-manipulation items-center justify-center gap-0.5 rounded-lg px-2 py-1.5 system-xs-medium text-text-secondary tabular-nums hover:cursor-text hover:bg-state-base-hover-alt',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9fb3b66c501..3d4cde32183 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -171,8 +171,8 @@ catalogs:
specifier: 1.36.5
version: 1.36.5
'@axe-core/playwright':
- specifier: 4.13.0
- version: 4.13.0
+ specifier: 4.14.0
+ version: 4.14.0
'@base-ui/react':
specifier: 1.9.0
version: 1.9.0
@@ -428,6 +428,9 @@ catalogs:
ajv:
specifier: 8.20.0
version: 8.20.0
+ axe-core:
+ specifier: 4.14.0
+ version: 4.14.0
bowser:
specifier: 2.15.0
version: 2.15.0
@@ -796,7 +799,6 @@ catalogs:
overrides:
'@babel/core@<=7.29.0': ^7.29.1
'@lexical/code': npm:[email protected]
- axe-core: 4.13.0
canvas: ^3.2.3
esbuild@<0.28.1: ^0.28.2
fflate@>=0.7.0 <0.7.5: 0.7.5
@@ -932,7 +934,7 @@ importers:
devDependencies:
'@axe-core/playwright':
specifier: 'catalog:'
- version: 4.13.0([email protected])
+ version: 4.14.0([email protected])
'@cucumber/cucumber':
specifier: 'catalog:'
version: 13.3.0
@@ -1913,8 +1915,8 @@ importers:
specifier: 'catalog:'
axe-core:
- specifier: 4.13.0
- version: 4.13.0
+ specifier: 'catalog:'
+ version: 4.14.0
code-inspector-plugin:
specifier: 'catalog:'
version: 1.6.6([email protected])
@@ -2062,8 +2064,9 @@ packages:
resolution: {integrity: sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==}
- '@axe-core/[email protected]':
- resolution: {integrity: sha512-6YLx+kxXu5GJceG4ozFg+33a2EMTdjYwWGloJ3sb9Kta5pp+ZNS53uxGVog5JetIY8s++P5UrtX+cri+u0VAVg==}
+ '@axe-core/[email protected]':
+ resolution: {integrity: sha512-SGUhG5PIHd2eMdpgBF2PyQLOhX+qyDR2PT4cmoS4Qk2ak+jX/rrSvst9l0PGv5WTHolKpUMvVmoHpr4cZgf1RQ==}
+ engines: {node: '>=22.12.0'}
peerDependencies:
playwright-core: '>= 1.0.0'
@@ -5757,8 +5760,8 @@ packages:
resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
- resolution: {integrity: sha512-UzGt8zg7Ny8djbYMhxl2zuEevVa7r2gJjYY5Lwr1xM7+XU2nd6CkIWFTVcCIbAP63vSz71NaVyyuSk9lHKcy0A==}
+ resolution: {integrity: sha512-9WTZxEjsZ7b13TH8JPmbV2z8CHbl80/2hm3XPEG4JgNdQLK81IBRXmSxHfMAOkSqQeRxT/0dwNDz2GOm3zzpcQ==}
engines: {node: '>=4'}
@@ -9445,9 +9448,9 @@ snapshots:
'@antfu/[email protected]': {}
dependencies:
- axe-core: 4.13.0
+ axe-core: 4.14.0
playwright-core: 1.64.1
@@ -11430,7 +11433,7 @@ snapshots:
dependencies:
'@storybook/global': 5.0.0
- axe-core: 4.13.0
+ axe-core: 4.14.0
@@ -12748,7 +12751,7 @@ snapshots:
@@ -16941,7 +16944,7 @@ snapshots:
time:
'@amplitude/[email protected]': '2026-10-20T17:25:28.017Z'
'@amplitude/[email protected]': '2026-10-29T00:26:39.968Z'
- '@axe-core/[email protected]': '2026-08-11T17:07:40.763Z'
+ '@axe-core/[email protected]': '2026-10-15T13:33:17.706Z'
'@base-ui/[email protected]': '2026-10-09T08:52:43.788Z'
'@base-ui/[email protected]': '2026-10-09T08:50:42.770Z'
'@chromatic-com/[email protected]': '2026-10-20T11:23:24.880Z'
@@ -17028,7 +17031,7 @@ time:
[email protected]: '2026-09-22T02:41:05.110Z'
[email protected]: '2026-10-27T14:22:24.208Z'
[email protected]: '2026-04-24T15:22:16.529Z'
- [email protected]: '2026-08-05T16:53:07.262Z'
+ [email protected]: '2026-10-05T17:43:36.099Z'
[email protected]: '2026-10-26T20:06:27.699Z'
[email protected]: '2026-10-27T11:36:44.468Z'
[email protected]: '2025-11-25T23:28:06.854Z'
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index b9f91426c3d..d01a99226db 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -48,8 +48,6 @@ packages:
overrides:
'@babel/core@<=7.29.0': ^7.29.1
'@lexical/code': npm:[email protected]
- # axe-core 4.14 enables label-content-name-mismatch, which flags existing dify-ui stories; drop once they are fixed.
- axe-core: 4.13.0
canvas: ^3.2.3
esbuild@<0.28.1: ^0.28.2
fflate@>=0.7.0 <0.7.5: 0.7.5
@@ -74,7 +72,7 @@ overrides:
catalog:
'@amplitude/analytics-browser': 2.48.1
'@amplitude/plugin-session-replay-browser': 1.36.5
- '@axe-core/playwright': 4.13.0
+ '@axe-core/playwright': 4.14.0
'@base-ui/react': 1.9.0
'@base-ui/utils': 0.5.0
'@chromatic-com/storybook': 5.6.0
@@ -161,7 +159,7 @@ catalog:
agentation: 3.1.2
ahooks: 3.11.0
ajv: 8.20.0
- axe-core: 4.13.0
+ axe-core: 4.14.0
bowser: 2.15.0
c12: 4.0.0-rc.4
chokidar: 5.0.0
diff --git a/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx b/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx
index 8020e37b6e1..616e6c18d38 100644
--- a/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx
+++ b/web/app/components/base/date-time-picker/__tests__/localization.spec.tsx
@@ -68,12 +68,18 @@ it('localizes empty picker placeholders and preserves a caller override', async
</DatePicker>
</I18nextProvider>,
)
- expect(screen.getByRole('button', { name: 'Date' })).toHaveTextContent(zh['operation.pickDate'])
- expect(screen.getByRole('button', { name: 'Meeting' })).toHaveTextContent(
- zh['operation.pickDate'],
+ expect(
+ screen.getByRole('button', { name: `Date ${zh['operation.pickDate']}` }),
+ ).toHaveTextContent(zh['operation.pickDate'])
+ expect(
+ screen.getByRole('button', { name: `Meeting ${zh['operation.pickDate']}` }),
+ ).toHaveTextContent(zh['operation.pickDate'])
+ expect(screen.getByRole('button', { name: `Time ${zh['title.pickTime']}` })).toHaveTextContent(
+ zh['title.pickTime'],
+ )
+ expect(screen.getByRole('button', { name: 'Billing Choose billing day' })).toHaveTextContent(
+ 'Choose billing day',
)
- expect(screen.getByRole('button', { name: 'Time' })).toHaveTextContent(zh['title.pickTime'])
- expect(screen.getByRole('button', { name: 'Billing' })).toHaveTextContent('Choose billing day')
})
it('updates time formatting and popup labels from the application language without locale props', async () => {
@@ -153,7 +159,10 @@ it.each([
</I18nextProvider>,
)
await user.click(screen.getByRole('button', { name: /^Date / }))
- expect(screen.getByRole('button', { name: dayLabel })).toHaveAttribute('aria-current', 'date')
+ expect(screen.getByRole('button', { name: `28: ${dayLabel}` })).toHaveAttribute(
+ 'aria-current',
+ 'date',
+ )
expect(screen.getByRole('gridcell', { selected: true })).toBeInTheDocument()
expect(screen.getByRole('navigation', { name: 'Calendar navigation' })).toBeInTheDocument()
} finally {
diff --git a/web/app/components/base/markdown-blocks/__tests__/form.browser.spec.tsx b/web/app/components/base/markdown-blocks/__tests__/form.browser.spec.tsx
index 54cfb7bb2e9..3aaa9f0676e 100644
--- a/web/app/components/base/markdown-blocks/__tests__/form.browser.spec.tsx
+++ b/web/app/components/base/markdown-blocks/__tests__/form.browser.spec.tsx
@@ -47,7 +47,7 @@ it('blocks chat submission for a cleared required picker and sends the confirmed
await screen.getByRole('button', { name: 'common.operation.clear' }).click()
await screen.getByRole('button', { name: 'Submit booking' }).click()
expect(onSend).not.toHaveBeenCalled()
- const trigger = screen.getByRole('button', { name: 'Departure' })
+ const trigger = screen.getByRole('button', { name: 'Departure time.operation.pickDate' })
await expect.element(trigger).toHaveFocus()
await expect.element(trigger).toHaveAttribute('aria-invalid', 'true')
await expect.element(trigger).toHaveAccessibleDescription(/time.picker.required/)
diff --git a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
index ec8dfc17124..4ff1be1f312 100644
--- a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
+++ b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
@@ -392,7 +392,8 @@ describe('MarkdownForm', () => {
/>,
)
await user.click(screen.getByText('Departure', { exact: true }))
- const trigger = screen.getByRole('button', { name: 'Departure' })
+ const placeholder = type === 'time' ? 'time.title.pickTime' : 'time.operation.pickDate'
+ const trigger = screen.getByRole('button', { name: `Departure ${placeholder}` })
expect(trigger).toHaveFocus()
expect(trigger).toHaveAttribute('aria-expanded', 'false')
expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
diff --git a/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx b/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
index eee16ad7ac7..02c5f814f9a 100644
--- a/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
+++ b/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
@@ -75,13 +75,13 @@ it('keeps a cleared metadata date empty when its owner stores null', async () =>
}
render(<Example />)
await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
- expect(screen.getByRole('button', { name: 'Published' })).toHaveTextContent(
- 'dataset.metadata.chooseTime',
- )
+ expect(
+ screen.getByRole('button', { name: 'Published dataset.metadata.chooseTime' }),
+ ).toHaveTextContent('dataset.metadata.chooseTime')
expect(screen.queryByRole('button', { name: 'common.operation.clear' })).not.toBeInTheDocument()
- await user.click(screen.getByRole('button', { name: 'Published' }))
+ await user.click(screen.getByRole('button', { name: 'Published dataset.metadata.chooseTime' }))
await user.keyboard('{Escape}')
- expect(screen.getByRole('button', { name: 'Published' })).toHaveTextContent(
- 'dataset.metadata.chooseTime',
- )
+ expect(
+ screen.getByRole('button', { name: 'Published dataset.metadata.chooseTime' }),
+ ).toHaveTextContent('dataset.metadata.chooseTime')
})
diff --git a/web/i18n/locales/ar-TN/common.json b/web/i18n/locales/ar-TN/common.json
index d49dbd6a5c9..eb2189f6e97 100644
--- a/web/i18n/locales/ar-TN/common.json
+++ b/web/i18n/locales/ar-TN/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "تكبير",
"operation.zoomOut": "تصغير",
"pageUnavailable": "الصفحة غير متاحة",
- "pagination.editPageNumber": "تعديل رقم الصفحة، الصفحة الحالية {{page}} من {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: تعديل رقم الصفحة",
"pagination.next": "الصفحة التالية",
"pagination.pageNumber": "رقم الصفحة",
"pagination.perPage": "عناصر لكل صفحة",
diff --git a/web/i18n/locales/az-AZ/common.json b/web/i18n/locales/az-AZ/common.json
index 000aa4ce7e8..3cacd6aef6b 100644
--- a/web/i18n/locales/az-AZ/common.json
+++ b/web/i18n/locales/az-AZ/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Yaxınlaşdır",
"operation.zoomOut": "Uzaqlaşdır",
"pageUnavailable": "Səhifə əlçatan deyil",
- "pagination.editPageNumber": "Səhifə nömrəsini redaktə et. Cəmi {{totalPages}} səhifə, cari səhifə: {{page}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Səhifə nömrəsini redaktə et",
"pagination.next": "Növbəti səhifəyə keç",
"pagination.pageNumber": "Səhifə nömrəsi",
"pagination.perPage": "Hər səhifədəki elementlərin sayı",
diff --git a/web/i18n/locales/de-DE/common.json b/web/i18n/locales/de-DE/common.json
index 86c2ca5943e..819d3ad91e3 100644
--- a/web/i18n/locales/de-DE/common.json
+++ b/web/i18n/locales/de-DE/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Vergrößern",
"operation.zoomOut": "Verkleinern",
"pageUnavailable": "Seite nicht verfügbar",
- "pagination.editPageNumber": "Seitennummer bearbeiten, aktuelle Seite {{page}} von {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Seitennummer bearbeiten",
"pagination.next": "Nächste Seite",
"pagination.pageNumber": "Seitennummer",
"pagination.perPage": "Artikel pro Seite",
diff --git a/web/i18n/locales/en-US/common.json b/web/i18n/locales/en-US/common.json
index 2e1f934cbd3..25b286cec82 100644
--- a/web/i18n/locales/en-US/common.json
+++ b/web/i18n/locales/en-US/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Zoom In",
"operation.zoomOut": "Zoom Out",
"pageUnavailable": "Page not available",
- "pagination.editPageNumber": "Edit page number, current page {{page}} of {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Edit page number",
"pagination.next": "Next page",
"pagination.pageNumber": "Page number",
"pagination.perPage": "Items per page",
diff --git a/web/i18n/locales/es-ES/common.json b/web/i18n/locales/es-ES/common.json
index 04fbbf44138..d5a95e2399c 100644
--- a/web/i18n/locales/es-ES/common.json
+++ b/web/i18n/locales/es-ES/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Acercar",
"operation.zoomOut": "Alejar",
"pageUnavailable": "Página no disponible",
- "pagination.editPageNumber": "Editar número de página, página actual {{page}} de {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Editar número de página",
"pagination.next": "Página siguiente",
"pagination.pageNumber": "Número de página",
"pagination.perPage": "Elementos por página",
diff --git a/web/i18n/locales/fa-IR/common.json b/web/i18n/locales/fa-IR/common.json
index 18de6a137be..209255024b6 100644
--- a/web/i18n/locales/fa-IR/common.json
+++ b/web/i18n/locales/fa-IR/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "بزرگنمایی",
"operation.zoomOut": "کوچک نمایی",
"pageUnavailable": "صفحه در دسترس نیست",
- "pagination.editPageNumber": "ویرایش شماره صفحه، صفحه فعلی {{page}} از {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: ویرایش شماره صفحه",
"pagination.next": "صفحه بعد",
"pagination.pageNumber": "شماره صفحه",
"pagination.perPage": "موارد در هر صفحه",
diff --git a/web/i18n/locales/fr-FR/common.json b/web/i18n/locales/fr-FR/common.json
index 3b0c20770da..64cfae227a5 100644
--- a/web/i18n/locales/fr-FR/common.json
+++ b/web/i18n/locales/fr-FR/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Zoom avant",
"operation.zoomOut": "Zoom arrière",
"pageUnavailable": "Page non disponible",
- "pagination.editPageNumber": "Modifier le numéro de page, page actuelle {{page}} sur {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Modifier le numéro de page",
"pagination.next": "Page suivante",
"pagination.pageNumber": "Numéro de page",
"pagination.perPage": "Articles par page",
diff --git a/web/i18n/locales/hi-IN/common.json b/web/i18n/locales/hi-IN/common.json
index a236586a8ec..7464b20b7d3 100644
--- a/web/i18n/locales/hi-IN/common.json
+++ b/web/i18n/locales/hi-IN/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "ज़ूम इन करें",
"operation.zoomOut": "ज़ूम आउट करें",
"pageUnavailable": "पृष्ठ उपलब्ध नहीं है",
- "pagination.editPageNumber": "पृष्ठ संख्या संपादित करें, वर्तमान पृष्ठ {{page}} / {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: पृष्ठ संख्या संपादित करें",
"pagination.next": "अगला पृष्ठ",
"pagination.pageNumber": "पृष्ठ संख्या",
"pagination.perPage": "प्रति पृष्ठ आइटम",
diff --git a/web/i18n/locales/id-ID/common.json b/web/i18n/locales/id-ID/common.json
index e6386390b10..705d5495006 100644
--- a/web/i18n/locales/id-ID/common.json
+++ b/web/i18n/locales/id-ID/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Perbesar",
"operation.zoomOut": "Perkecil",
"pageUnavailable": "Halaman tidak tersedia",
- "pagination.editPageNumber": "Edit nomor halaman, halaman saat ini {{page}} dari {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Edit nomor halaman",
"pagination.next": "Halaman berikutnya",
"pagination.pageNumber": "Nomor halaman",
"pagination.perPage": "Item per halaman",
diff --git a/web/i18n/locales/it-IT/common.json b/web/i18n/locales/it-IT/common.json
index addfecb93b3..44ad3a5cecc 100644
--- a/web/i18n/locales/it-IT/common.json
+++ b/web/i18n/locales/it-IT/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Ingrandisci",
"operation.zoomOut": "Zoom indietro",
"pageUnavailable": "Pagina non disponibile",
- "pagination.editPageNumber": "Modifica numero pagina, pagina corrente {{page}} di {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Modifica numero pagina",
"pagination.next": "Pagina successiva",
"pagination.pageNumber": "Numero pagina",
"pagination.perPage": "Articoli per pagina",
diff --git a/web/i18n/locales/ja-JP/common.json b/web/i18n/locales/ja-JP/common.json
index 367a4816e4d..ff010484d13 100644
--- a/web/i18n/locales/ja-JP/common.json
+++ b/web/i18n/locales/ja-JP/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "ズームインする",
"operation.zoomOut": "ズームアウト",
"pageUnavailable": "ページは利用できません",
- "pagination.editPageNumber": "ページ番号を編集、現在のページ {{page}} / {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: ページ番号を編集",
"pagination.next": "次のページ",
"pagination.pageNumber": "ページ番号",
"pagination.perPage": "ページあたりのアイテム数",
diff --git a/web/i18n/locales/ko-KR/common.json b/web/i18n/locales/ko-KR/common.json
index c639134ac0a..d48fd939aef 100644
--- a/web/i18n/locales/ko-KR/common.json
+++ b/web/i18n/locales/ko-KR/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "확대",
"operation.zoomOut": "축소",
"pageUnavailable": "페이지를 사용할 수 없습니다",
- "pagination.editPageNumber": "페이지 번호 편집, 현재 {{page}} / {{totalPages}} 페이지",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: 페이지 번호 편집",
"pagination.next": "다음 페이지",
"pagination.pageNumber": "페이지 번호",
"pagination.perPage": "페이지당 항목 수",
diff --git a/web/i18n/locales/lo-LA/common.json b/web/i18n/locales/lo-LA/common.json
index f52976efe3a..16cda4a097a 100644
--- a/web/i18n/locales/lo-LA/common.json
+++ b/web/i18n/locales/lo-LA/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "ຂະຫຍາຍເຂົ້າ",
"operation.zoomOut": "ຂະຫຍາຍອອກ",
"pageUnavailable": "ໜ້າເວັບບໍ່ພ້ອມໃຊ້ງານ",
- "pagination.editPageNumber": "ແກ້ໄຂເລກໜ້າ, ໜ້າປັດຈຸບັນ {{page}} ຈາກທັງໝົດ {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: ແກ້ໄຂເລກໜ້າ",
"pagination.next": "ໜ້າຖັດໄປ",
"pagination.pageNumber": "ເລກໜ້າ",
"pagination.perPage": "ລາຍການຕໍ່ໜ້າ",
diff --git a/web/i18n/locales/nl-NL/common.json b/web/i18n/locales/nl-NL/common.json
index 52219537211..e51bc0a9e63 100644
--- a/web/i18n/locales/nl-NL/common.json
+++ b/web/i18n/locales/nl-NL/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Zoom In",
"operation.zoomOut": "Zoom Out",
"pageUnavailable": "Pagina niet beschikbaar",
- "pagination.editPageNumber": "Paginanummer bewerken, huidige pagina {{page}} van {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Paginanummer bewerken",
"pagination.next": "Volgende pagina",
"pagination.pageNumber": "Paginanummer",
"pagination.perPage": "Items per page",
diff --git a/web/i18n/locales/pl-PL/common.json b/web/i18n/locales/pl-PL/common.json
index ccb7cf231bb..4c5335f864f 100644
--- a/web/i18n/locales/pl-PL/common.json
+++ b/web/i18n/locales/pl-PL/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Powiększenie",
"operation.zoomOut": "Pomniejszanie",
"pageUnavailable": "Strona niedostępna",
- "pagination.editPageNumber": "Edytuj numer strony, bieżąca strona {{page}} z {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Edytuj numer strony",
"pagination.next": "Następna strona",
"pagination.pageNumber": "Numer strony",
"pagination.perPage": "Ilość elementów na stronie",
diff --git a/web/i18n/locales/pt-BR/common.json b/web/i18n/locales/pt-BR/common.json
index eb997e0185e..21046e8c04d 100644
--- a/web/i18n/locales/pt-BR/common.json
+++ b/web/i18n/locales/pt-BR/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Ampliar",
"operation.zoomOut": "Diminuir o zoom",
"pageUnavailable": "Página indisponível",
- "pagination.editPageNumber": "Editar número da página, página atual {{page}} de {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Editar número da página",
"pagination.next": "Próxima página",
"pagination.pageNumber": "Número da página",
"pagination.perPage": "Itens por página",
diff --git a/web/i18n/locales/ro-RO/common.json b/web/i18n/locales/ro-RO/common.json
index 1409b758e5c..19919249f48 100644
--- a/web/i18n/locales/ro-RO/common.json
+++ b/web/i18n/locales/ro-RO/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Măriți",
"operation.zoomOut": "Micșorare",
"pageUnavailable": "Pagina nu este disponibilă",
- "pagination.editPageNumber": "Editați numărul paginii, pagina curentă {{page}} din {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Editați numărul paginii",
"pagination.next": "Pagina următoare",
"pagination.pageNumber": "Numărul paginii",
"pagination.perPage": "Articole pe pagină",
diff --git a/web/i18n/locales/ru-RU/common.json b/web/i18n/locales/ru-RU/common.json
index 0fe850ba862..a0468bdf084 100644
--- a/web/i18n/locales/ru-RU/common.json
+++ b/web/i18n/locales/ru-RU/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Увеличить",
"operation.zoomOut": "Уменьшение масштаба",
"pageUnavailable": "Страница недоступна",
- "pagination.editPageNumber": "Изменить номер страницы, текущая страница {{page}} из {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Изменить номер страницы",
"pagination.next": "Следующая страница",
"pagination.pageNumber": "Номер страницы",
"pagination.perPage": "Элементов на странице",
diff --git a/web/i18n/locales/sl-SI/common.json b/web/i18n/locales/sl-SI/common.json
index 1ff2522d043..e9db504616b 100644
--- a/web/i18n/locales/sl-SI/common.json
+++ b/web/i18n/locales/sl-SI/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Povečava",
"operation.zoomOut": "Pomanjšanje",
"pageUnavailable": "Stran ni na voljo",
- "pagination.editPageNumber": "Uredi številko strani, trenutna stran {{page}} od {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Uredi številko strani",
"pagination.next": "Naslednja stran",
"pagination.pageNumber": "Številka strani",
"pagination.perPage": "Elementi na stran",
diff --git a/web/i18n/locales/th-TH/common.json b/web/i18n/locales/th-TH/common.json
index 6d931b3f9ae..acdb798aee2 100644
--- a/web/i18n/locales/th-TH/common.json
+++ b/web/i18n/locales/th-TH/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "ซูมเข้า",
"operation.zoomOut": "ซูมออก",
"pageUnavailable": "ไม่สามารถใช้งานหน้านี้ได้",
- "pagination.editPageNumber": "แก้ไขหมายเลขหน้า หน้าปัจจุบัน {{page}} จาก {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: แก้ไขหมายเลขหน้า",
"pagination.next": "หน้าถัดไป",
"pagination.pageNumber": "หมายเลขหน้า",
"pagination.perPage": "รายการต่อหน้า",
diff --git a/web/i18n/locales/tr-TR/common.json b/web/i18n/locales/tr-TR/common.json
index 6ac33594d59..db209d45990 100644
--- a/web/i18n/locales/tr-TR/common.json
+++ b/web/i18n/locales/tr-TR/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Yakınlaştırma",
"operation.zoomOut": "Uzaklaştırma",
"pageUnavailable": "Sayfa kullanılamıyor",
- "pagination.editPageNumber": "Sayfa numarasını düzenle, geçerli sayfa {{page}} / {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Sayfa numarasını düzenle",
"pagination.next": "Sonraki sayfa",
"pagination.pageNumber": "Sayfa numarası",
"pagination.perPage": "Sayfa başına öğe sayısı",
diff --git a/web/i18n/locales/uk-UA/common.json b/web/i18n/locales/uk-UA/common.json
index d2cb885e7ff..271a0b055e8 100644
--- a/web/i18n/locales/uk-UA/common.json
+++ b/web/i18n/locales/uk-UA/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Збільшити масштаб",
"operation.zoomOut": "Зменшити масштаб",
"pageUnavailable": "Сторінка недоступна",
- "pagination.editPageNumber": "Редагувати номер сторінки, поточна сторінка {{page}} з {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Редагувати номер сторінки",
"pagination.next": "Наступна сторінка",
"pagination.pageNumber": "Номер сторінки",
"pagination.perPage": "Елементів на сторінці",
diff --git a/web/i18n/locales/vi-VN/common.json b/web/i18n/locales/vi-VN/common.json
index f011bf8a630..70efd0ee94c 100644
--- a/web/i18n/locales/vi-VN/common.json
+++ b/web/i18n/locales/vi-VN/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "Phóng to",
"operation.zoomOut": "Thu nhỏ",
"pageUnavailable": "Trang không khả dụng",
- "pagination.editPageNumber": "Chỉnh sửa số trang, trang hiện tại {{page}} trên {{totalPages}}",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: Chỉnh sửa số trang",
"pagination.next": "Trang tiếp theo",
"pagination.pageNumber": "Số trang",
"pagination.perPage": "Mục trên mỗi trang",
diff --git a/web/i18n/locales/zh-Hans/common.json b/web/i18n/locales/zh-Hans/common.json
index 8f1897113b5..b5e8a9d3862 100644
--- a/web/i18n/locales/zh-Hans/common.json
+++ b/web/i18n/locales/zh-Hans/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "放大",
"operation.zoomOut": "缩小",
"pageUnavailable": "页面不可用",
- "pagination.editPageNumber": "编辑页码,当前第 {{page}} 页,共 {{totalPages}} 页",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: 编辑页码",
"pagination.next": "下一页",
"pagination.pageNumber": "页码",
"pagination.perPage": "每页显示",
diff --git a/web/i18n/locales/zh-Hant/common.json b/web/i18n/locales/zh-Hant/common.json
index b174265651d..aec4215a2e7 100644
--- a/web/i18n/locales/zh-Hant/common.json
+++ b/web/i18n/locales/zh-Hant/common.json
@@ -225,7 +225,7 @@
"operation.zoomIn": "放大",
"operation.zoomOut": "縮小",
"pageUnavailable": "頁面不可用",
- "pagination.editPageNumber": "編輯頁碼,目前第 {{page}} 頁,共 {{totalPages}} 頁",
+ "pagination.editPageNumber": "{{page}}/{{totalPages}}: 編輯頁碼",
"pagination.next": "下一頁",
"pagination.pageNumber": "頁碼",
"pagination.perPage": "每頁項目數",
diff --git a/web/i18n/resources.generated.d.ts b/web/i18n/resources.generated.d.ts
index 81cbde4133d..4abbf4ccec7 100644
--- a/web/i18n/resources.generated.d.ts
+++ b/web/i18n/resources.generated.d.ts
@@ -1878,7 +1878,7 @@ export default interface Resources {
'operation.zoomIn': 'Zoom In'
'operation.zoomOut': 'Zoom Out'
pageUnavailable: 'Page not available'
- 'pagination.editPageNumber': 'Edit page number, current page {{page}} of {{totalPages}}'
+ 'pagination.editPageNumber': '{{page}}/{{totalPages}}: Edit page number'
'pagination.next': 'Next page'
'pagination.pageNumber': 'Page number'
'pagination.perPage': 'Items per page'