Skip to content

Commit 80048ec

Browse files
committed
Revert not working solution on v7
1 parent c81167c commit 80048ec

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

packages/x-date-pickers/src/locales/zhCN.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ const zhCNPickers: Partial<PickersLocaleText<any>> = {
5757
calendarWeekNumberText: (weekNumber) => `${weekNumber}`,
5858

5959
// Open picker labels
60-
openDatePickerDialogue: (formattedDate) =>
61-
formattedDate ? `选择日期,已选择${formattedDate}` : '选择日期',
62-
openTimePickerDialogue: (formattedTime) =>
63-
formattedTime ? `选择时间,已选择${formattedTime}` : '选择时间',
60+
openDatePickerDialogue: (value, utils, formattedDate) =>
61+
formattedDate || (value !== null && utils.isValid(value))
62+
? `选择日期,已选择${formattedDate ?? utils.format(value, 'fullDate')}`
63+
: '选择日期',
64+
openTimePickerDialogue: (value, utils, formattedTime) =>
65+
formattedTime || (value !== null && utils.isValid(value))
66+
? `选择时间,已选择${formattedTime ?? utils.format(value, 'fullTime')}`
67+
: '选择时间',
6468
fieldClearLabel: '清除',
6569

6670
// Table labels

packages/x-date-pickers/src/locales/zhHK.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ const zhHKPickers: Partial<PickersLocaleText<any>> = {
5757
calendarWeekNumberText: (weekNumber) => `${weekNumber}`,
5858

5959
// Open picker labels
60-
openDatePickerDialogue: (formattedDate) =>
61-
formattedDate ? `選擇日期,已選擇${formattedDate}` : '選擇日期',
62-
openTimePickerDialogue: (formattedTime) =>
63-
formattedTime ? `選擇時間,已選擇${formattedTime}` : '選擇時間',
60+
openDatePickerDialogue: (value, utils, formattedDate) =>
61+
formattedDate || (value !== null && utils.isValid(value))
62+
? `選擇日期,已選擇${formattedDate ?? utils.format(value, 'fullDate')}`
63+
: '選擇日期',
64+
openTimePickerDialogue: (value, utils, formattedTime) =>
65+
formattedTime || (value !== null && utils.isValid(value))
66+
? `選擇時間,已選擇${formattedTime ?? utils.format(value, 'fullTime')}`
67+
: '選擇時間',
6468
fieldClearLabel: '清除',
6569

6670
// Table labels

packages/x-date-pickers/src/locales/zhTW.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ const zhTWPickers: Partial<PickersLocaleText<any>> = {
5757
calendarWeekNumberText: (weekNumber) => `${weekNumber}`,
5858

5959
// Open picker labels
60-
openDatePickerDialogue: (formattedDate) =>
61-
formattedDate ? `選擇日期,已選擇${formattedDate}` : '選擇日期',
62-
openTimePickerDialogue: (formattedTime) =>
63-
formattedTime ? `選擇時間,已選擇${formattedTime}` : '選擇時間',
60+
openDatePickerDialogue: (value, utils, formattedDate) =>
61+
formattedDate || (value !== null && utils.isValid(value))
62+
? `選擇日期,已選擇${formattedDate ?? utils.format(value, 'fullDate')}`
63+
: '選擇日期',
64+
openTimePickerDialogue: (value, utils, formattedTime) =>
65+
formattedTime || (value !== null && utils.isValid(value))
66+
? `選擇時間,已選擇${formattedTime ?? utils.format(value, 'fullTime')}`
67+
: '選擇時間',
6468
fieldClearLabel: '清除',
6569

6670
// Table labels

0 commit comments

Comments
 (0)