From 2859957a86dd3d693b3864d4d502308e1acd1994 Mon Sep 17 00:00:00 2001 From: delangle Date: Tue, 15 Nov 2022 13:02:23 +0100 Subject: [PATCH] Rename param on inputModeToggleButtonAriaLabel --- .../x-date-pickers/src/TimePicker/TimePickerToolbar.tsx | 2 +- .../src/internals/components/PickersToolbar.tsx | 8 ++++---- packages/x-date-pickers/src/locales/deDE.ts | 6 +++--- packages/x-date-pickers/src/locales/enUS.ts | 2 +- packages/x-date-pickers/src/locales/esES.ts | 2 +- packages/x-date-pickers/src/locales/faIR.ts | 2 +- packages/x-date-pickers/src/locales/fiFI.ts | 6 +++--- packages/x-date-pickers/src/locales/frFR.ts | 6 +++--- packages/x-date-pickers/src/locales/isIS.ts | 7 ++----- packages/x-date-pickers/src/locales/itIT.ts | 2 +- packages/x-date-pickers/src/locales/jaJP.ts | 6 +++--- packages/x-date-pickers/src/locales/koKR.ts | 2 +- packages/x-date-pickers/src/locales/nbNO.ts | 2 +- packages/x-date-pickers/src/locales/nlNL.ts | 2 +- packages/x-date-pickers/src/locales/plPL.ts | 2 +- packages/x-date-pickers/src/locales/ptBR.ts | 2 +- packages/x-date-pickers/src/locales/svSE.ts | 2 +- packages/x-date-pickers/src/locales/trTR.ts | 2 +- packages/x-date-pickers/src/locales/ukUA.ts | 2 +- .../src/locales/utils/pickersLocaleTextApi.ts | 2 +- packages/x-date-pickers/src/locales/zhCN.ts | 2 +- 21 files changed, 33 insertions(+), 36 deletions(-) diff --git a/packages/x-date-pickers/src/TimePicker/TimePickerToolbar.tsx b/packages/x-date-pickers/src/TimePicker/TimePickerToolbar.tsx index dd6a5ba3ce74f..58036ed66b748 100644 --- a/packages/x-date-pickers/src/TimePicker/TimePickerToolbar.tsx +++ b/packages/x-date-pickers/src/TimePicker/TimePickerToolbar.tsx @@ -162,7 +162,7 @@ export function TimePickerToolbar(inProps: TimePickerTool return ( 'isMobileKeyboardViewOpen' | 'toggleMobileKeyboardView' | 'isLandscape' > { className?: string; - viewType?: 'calendar' | 'clock'; + viewType?: 'date' | 'time'; landscapeDirection?: 'row' | 'column'; toolbarTitle: React.ReactNode; classes?: Partial; @@ -83,8 +83,8 @@ const PickersToolbarPenIconButton = styled(IconButton, { ownerState: PickersToolbarProps; }>({}); -const getViewTypeIcon = (viewType: 'calendar' | 'clock') => - viewType === 'clock' ? : ; +const getViewTypeIcon = (viewType: 'date' | 'time') => + viewType === 'time' ? : ; type PickersToolbarComponent = (( props: React.PropsWithChildren> & @@ -107,7 +107,7 @@ export const PickersToolbar = React.forwardRef(function PickersToolbar< landscapeDirection = 'column', toggleMobileKeyboardView, toolbarTitle, - viewType = 'calendar', + viewType = 'date', } = props; const ownerState = props; diff --git a/packages/x-date-pickers/src/locales/deDE.ts b/packages/x-date-pickers/src/locales/deDE.ts index f893e8176f611..8080b03c17f7d 100644 --- a/packages/x-date-pickers/src/locales/deDE.ts +++ b/packages/x-date-pickers/src/locales/deDE.ts @@ -11,8 +11,8 @@ const timeViews = { // maps PickersToolbar["viewType"] to its translation const pickerViews = { - calendar: 'Kalenderansicht', - clock: 'Uhransicht', + date: 'Kalenderansicht', + time: 'Uhransicht', }; const deDEPickers: Partial> = { @@ -27,7 +27,7 @@ const deDEPickers: Partial> = { view === 'year' ? 'Jahresansicht ist geöffnet, zur Kalenderansicht wechseln' : 'Kalenderansicht ist geöffnet, zur Jahresansicht wechseln', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `Texteingabeansicht ist geöffnet, zur ${pickerViews[viewType]} wechseln` : `${pickerViews[viewType]} ist geöffnet, zur Texteingabeansicht wechseln`, diff --git a/packages/x-date-pickers/src/locales/enUS.ts b/packages/x-date-pickers/src/locales/enUS.ts index 2715e2936bc10..8b21deb1bf955 100644 --- a/packages/x-date-pickers/src/locales/enUS.ts +++ b/packages/x-date-pickers/src/locales/enUS.ts @@ -16,7 +16,7 @@ const enUSPickers: PickersLocaleText = { view === 'year' ? 'year view is open, switch to calendar view' : 'calendar view is open, switch to year view', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, diff --git a/packages/x-date-pickers/src/locales/esES.ts b/packages/x-date-pickers/src/locales/esES.ts index d551588f493f8..d99217f554a93 100644 --- a/packages/x-date-pickers/src/locales/esES.ts +++ b/packages/x-date-pickers/src/locales/esES.ts @@ -20,7 +20,7 @@ const esESPickers: Partial> = { view === 'year' ? 'la vista del año está abierta, cambie a la vista de calendario' : 'la vista de calendario está abierta, cambie a la vista del año', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Empezar', diff --git a/packages/x-date-pickers/src/locales/faIR.ts b/packages/x-date-pickers/src/locales/faIR.ts index ac07f41fadd88..03adfbe5c6cc8 100644 --- a/packages/x-date-pickers/src/locales/faIR.ts +++ b/packages/x-date-pickers/src/locales/faIR.ts @@ -14,7 +14,7 @@ const faIRPickers: Partial> = { view === 'year' ? 'نمای سال باز است، رفتن به نمای تقویم' : 'نمای تقویم باز است، رفتن به نمای سال', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `نمای ورودی متن باز است، رفتن به نمای ${viewType}` : `نمای ${viewType} باز است، رفتن به نمای ورودی متن`, diff --git a/packages/x-date-pickers/src/locales/fiFI.ts b/packages/x-date-pickers/src/locales/fiFI.ts index 55c9f751f6fce..4aa064d764aa0 100644 --- a/packages/x-date-pickers/src/locales/fiFI.ts +++ b/packages/x-date-pickers/src/locales/fiFI.ts @@ -9,8 +9,8 @@ const views = { }; const viewTranslation = { - calendar: 'kalenteri', - clock: 'kello', + date: 'kalenteri', + time: 'kello', }; const fiFIPickers: Partial> = { @@ -25,7 +25,7 @@ const fiFIPickers: Partial> = { view === 'year' ? 'vuosinäkymä on auki, vaihda kalenterinäkymään' : 'kalenterinäkymä on auki, vaihda vuosinäkymään', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `tekstikenttä on auki, mene ${viewTranslation[viewType]}näkymään` : `${viewTranslation[viewType]}näkymä on auki, mene tekstikenttään`, diff --git a/packages/x-date-pickers/src/locales/frFR.ts b/packages/x-date-pickers/src/locales/frFR.ts index c6bcb6cd099fd..43eda1194e5f1 100644 --- a/packages/x-date-pickers/src/locales/frFR.ts +++ b/packages/x-date-pickers/src/locales/frFR.ts @@ -9,8 +9,8 @@ const views = { }; const viewTranslation = { - calendar: 'calendrier', - clock: 'horloge', + date: 'calendrier', + time: 'horloge', }; const frFRPickers: Partial> = { @@ -25,7 +25,7 @@ const frFRPickers: Partial> = { view === 'year' ? 'La vue année est ouverte, ouvrir la vue calendrier' : 'La vue calendrier est ouverte, ouvrir la vue année', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `passer du champ text au ${viewTranslation[viewType]}` : `passer du ${viewTranslation[viewType]} au champ text`, diff --git a/packages/x-date-pickers/src/locales/isIS.ts b/packages/x-date-pickers/src/locales/isIS.ts index abfb8aeedb4e5..75971eca90243 100644 --- a/packages/x-date-pickers/src/locales/isIS.ts +++ b/packages/x-date-pickers/src/locales/isIS.ts @@ -14,11 +14,8 @@ const isISPickers: Partial> = { view === 'year' ? 'ársskoðun er opin, skipta yfir í dagatalsskoðun' : 'dagatalsskoðun er opin, skipta yfir í ársskoðun', - inputModeToggleButtonAriaLabel: ( - isKeyboardInputOpen: boolean, - viewType: 'calendar' | 'clock', - ) => { - const viewTypeTranslated = viewType === 'calendar' ? 'dagatals' : 'klukku'; + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => { + const viewTypeTranslated = viewType === 'date' ? 'dagatals' : 'klukku'; return isKeyboardInputOpen ? `textainnsláttur er opinn, fara í ${viewTypeTranslated}skoðun` : `${viewTypeTranslated}skoðun er opin, opna fyrir textainnslátt`; diff --git a/packages/x-date-pickers/src/locales/itIT.ts b/packages/x-date-pickers/src/locales/itIT.ts index 5f480c93701ae..dee4fc4065543 100644 --- a/packages/x-date-pickers/src/locales/itIT.ts +++ b/packages/x-date-pickers/src/locales/itIT.ts @@ -20,7 +20,7 @@ const itITPickers: Partial> = { view === 'year' ? "la vista dell'anno è aperta, passare alla vista del calendario" : "la vista dell'calendario è aperta, passare alla vista dell'anno", - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Inizio', diff --git a/packages/x-date-pickers/src/locales/jaJP.ts b/packages/x-date-pickers/src/locales/jaJP.ts index 160c664047a06..926787a1c807e 100644 --- a/packages/x-date-pickers/src/locales/jaJP.ts +++ b/packages/x-date-pickers/src/locales/jaJP.ts @@ -11,8 +11,8 @@ const timeViews = { // maps PickersToolbar["viewType"] to its translation const pickerViews = { - calendar: 'カレンダー表示', - clock: '時計表示', + date: 'カレンダー表示', + time: '時計表示', }; const jaJPPickers: Partial> = { @@ -27,7 +27,7 @@ const jaJPPickers: Partial> = { view === 'year' ? '年選択表示からカレンダー表示に切り替える' : 'カレンダー表示から年選択表示に切り替える', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `テキスト入力表示から${pickerViews[viewType]}に切り替える` : `${pickerViews[viewType]}からテキスト入力表示に切り替える`, diff --git a/packages/x-date-pickers/src/locales/koKR.ts b/packages/x-date-pickers/src/locales/koKR.ts index 78bf0081d554d..6c2b1c34893e7 100644 --- a/packages/x-date-pickers/src/locales/koKR.ts +++ b/packages/x-date-pickers/src/locales/koKR.ts @@ -20,7 +20,7 @@ const koKRPickers: Partial> = { view === 'year' ? '연도 선택 화면에서 달력 화면으로 전환하기' : '달력 화면에서 연도 선택 화면으로 전환하기', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: '시작', diff --git a/packages/x-date-pickers/src/locales/nbNO.ts b/packages/x-date-pickers/src/locales/nbNO.ts index 300e5c59369ec..72a7a05f08bcd 100644 --- a/packages/x-date-pickers/src/locales/nbNO.ts +++ b/packages/x-date-pickers/src/locales/nbNO.ts @@ -14,7 +14,7 @@ const nbNOPickers: Partial> = { view === 'year' ? 'årsvisning er åpen, bytt til kalendervisning' : 'kalendervisning er åpen, bytt til årsvisning', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Start', diff --git a/packages/x-date-pickers/src/locales/nlNL.ts b/packages/x-date-pickers/src/locales/nlNL.ts index fb5b8e147ee25..d91150491e352 100644 --- a/packages/x-date-pickers/src/locales/nlNL.ts +++ b/packages/x-date-pickers/src/locales/nlNL.ts @@ -14,7 +14,7 @@ const nlNLPickers: Partial> = { view === 'year' ? 'jaarweergave is geopend, schakel over naar kalenderweergave' : 'kalenderweergave is geopend, switch naar jaarweergave', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Start', diff --git a/packages/x-date-pickers/src/locales/plPL.ts b/packages/x-date-pickers/src/locales/plPL.ts index c2942ba5a56e6..c7470f061f071 100644 --- a/packages/x-date-pickers/src/locales/plPL.ts +++ b/packages/x-date-pickers/src/locales/plPL.ts @@ -14,7 +14,7 @@ const plPLPickers: Partial> = { view === 'year' ? 'otwarty jest widok roku, przełącz na widok kalendarza' : 'otwarty jest widok kalendarza, przełącz na widok roku', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Początek', diff --git a/packages/x-date-pickers/src/locales/ptBR.ts b/packages/x-date-pickers/src/locales/ptBR.ts index 9e63dcf12e613..c1ab5bc96f5df 100644 --- a/packages/x-date-pickers/src/locales/ptBR.ts +++ b/packages/x-date-pickers/src/locales/ptBR.ts @@ -14,7 +14,7 @@ const ptBRPickers: Partial> = { view === 'year' ? 'Seleção de ano está aberta, alternando para seleção de calendário' : 'Seleção de calendários está aberta, alternando para seleção de ano', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Início', diff --git a/packages/x-date-pickers/src/locales/svSE.ts b/packages/x-date-pickers/src/locales/svSE.ts index f0d6135116e9e..1a238ea895081 100644 --- a/packages/x-date-pickers/src/locales/svSE.ts +++ b/packages/x-date-pickers/src/locales/svSE.ts @@ -14,7 +14,7 @@ const svSEPickers: Partial> = { view === 'year' ? 'årsvyn är öppen, byt till kalendervy' : 'kalendervyn är öppen, byt till årsvy', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: 'Start', diff --git a/packages/x-date-pickers/src/locales/trTR.ts b/packages/x-date-pickers/src/locales/trTR.ts index 844608a85933d..5e790be2143a6 100644 --- a/packages/x-date-pickers/src/locales/trTR.ts +++ b/packages/x-date-pickers/src/locales/trTR.ts @@ -14,7 +14,7 @@ const trTRPickers: Partial> = { view === 'year' ? 'yıl görünümü açık, takvim görünümüne geç' : 'takvim görünümü açık, yıl görünümüne geç', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `metin girişi görünümü açık, şuraya gidin: ${viewType} görünümü` : `${viewType} görünüm açık, metin girişi görünümüne gidin`, diff --git a/packages/x-date-pickers/src/locales/ukUA.ts b/packages/x-date-pickers/src/locales/ukUA.ts index d4e6f70385fa8..c48eb5c1bad7a 100644 --- a/packages/x-date-pickers/src/locales/ukUA.ts +++ b/packages/x-date-pickers/src/locales/ukUA.ts @@ -16,7 +16,7 @@ const ukUAPickers: Partial> = { view === 'year' ? 'річний вигляд відкрито, перейти до календарного вигляду' : 'календарний вигляд відкрито, перейти до річного вигляду', - inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => + inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `текстове поле відкрите, перейти до ${viewType} вигляду` : `${viewType} вигляд наразі відкрито, перейти до текстового поля`, diff --git a/packages/x-date-pickers/src/locales/utils/pickersLocaleTextApi.ts b/packages/x-date-pickers/src/locales/utils/pickersLocaleTextApi.ts index ddb5358afdae4..e6b3c9e39ac5e 100644 --- a/packages/x-date-pickers/src/locales/utils/pickersLocaleTextApi.ts +++ b/packages/x-date-pickers/src/locales/utils/pickersLocaleTextApi.ts @@ -34,7 +34,7 @@ export interface PickersComponentAgnosticLocaleText { calendarViewSwitchingButtonAriaLabel: (currentView: DateView) => string; inputModeToggleButtonAriaLabel: ( isKeyboardInputOpen: boolean, - viewType: 'calendar' | 'clock', + viewType: 'date' | 'time', ) => string; // DateRange placeholders diff --git a/packages/x-date-pickers/src/locales/zhCN.ts b/packages/x-date-pickers/src/locales/zhCN.ts index 6a7b3e2852133..bccd5809ce0d1 100644 --- a/packages/x-date-pickers/src/locales/zhCN.ts +++ b/packages/x-date-pickers/src/locales/zhCN.ts @@ -18,7 +18,7 @@ const zhCNPickers: Partial> = { openNextView: '下一个视图', calendarViewSwitchingButtonAriaLabel: (view: DateView) => view === 'year' ? '年视图已打开,切换为日历视图' : '日历视图已打开,切换为年视图', - // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen: boolean, viewType: 'calendar' | 'clock') => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, + // inputModeToggleButtonAriaLabel: (isKeyboardInputOpen, viewType) => isKeyboardInputOpen ? `text input view is open, go to ${viewType} view` : `${viewType} view is open, go to text input view`, // DateRange placeholders start: '开始',