Skip to content

Commit

Permalink
Merge branch 'master' into improve-resize-performance
Browse files Browse the repository at this point in the history
  • Loading branch information
cherniavskii committed Nov 23, 2024
2 parents 0a0d10b + 419eb67 commit 0880afb
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 43 deletions.
6 changes: 3 additions & 3 deletions docs/data/data-grid/localization/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@
"languageTag": "pt-PT",
"importName": "ptPT",
"localeName": "Portuguese",
"missingKeysCount": 11,
"missingKeysCount": 0,
"totalKeysCount": 133,
"githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/locales/ptPT.ts"
},
{
"languageTag": "pt-BR",
"importName": "ptBR",
"localeName": "Portuguese (Brazil)",
"missingKeysCount": 11,
"missingKeysCount": 0,
"totalKeysCount": 133,
"githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/locales/ptBR.ts"
},
Expand Down Expand Up @@ -235,7 +235,7 @@
"languageTag": "es-ES",
"importName": "esES",
"localeName": "Spanish",
"missingKeysCount": 11,
"missingKeysCount": 0,
"totalKeysCount": 133,
"githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/locales/esES.ts"
},
Expand Down
23 changes: 12 additions & 11 deletions packages/x-data-grid/src/locales/esES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ const esESGrid: Partial<GridLocaleText> = {
toolbarQuickFilterDeleteIconLabel: 'Limpiar',

// Prompt toolbar field
// toolbarPromptControlPlaceholder: 'Type a prompt…',
// toolbarPromptControlWithRecordingPlaceholder: 'Type or record a prompt…',
// toolbarPromptControlRecordingPlaceholder: 'Listening for prompt…',
// toolbarPromptControlLabel: 'Prompt input',
// toolbarPromptControlDeleteIconLabel: 'Clear',
// toolbarPromptControlRecordButtonDefaultLabel: 'Record',
// toolbarPromptControlRecordButtonActiveLabel: 'Stop recording',
// toolbarPromptControlSendActionLabel: 'Send',
// toolbarPromptControlSendActionAriaLabel: 'Send prompt',
// toolbarPromptControlErrorMessage: 'An error occurred while processing the request. Please try again with a different prompt.',
toolbarPromptControlPlaceholder: 'Escriba un prompt…',
toolbarPromptControlWithRecordingPlaceholder: 'Escriba o grabe un prompt…',
toolbarPromptControlRecordingPlaceholder: 'Esperando por un prompt…',
toolbarPromptControlLabel: 'Introduzca un prompt',
toolbarPromptControlDeleteIconLabel: 'Limpiar',
toolbarPromptControlRecordButtonDefaultLabel: 'Grabar',
toolbarPromptControlRecordButtonActiveLabel: 'Parar de grabar',
toolbarPromptControlSendActionLabel: 'Enviar',
toolbarPromptControlSendActionAriaLabel: 'Enviar prompt',
toolbarPromptControlErrorMessage:
'Ocurrió un error mientras se procesaba la petición. Por favor, intente de nuevo con otro prompt.',

// Export selector toolbar button text
toolbarExport: 'Exportar',
Expand All @@ -55,7 +56,7 @@ const esESGrid: Partial<GridLocaleText> = {
columnsManagementNoColumns: 'Sin columnas',
columnsManagementShowHideAllText: 'Mostrar/Ocultar todas',
columnsManagementReset: 'Restablecer',
// columnsManagementDeleteIconLabel: 'Clear',
columnsManagementDeleteIconLabel: 'Limpiar',

// Filter panel text
filterPanelAddFilter: 'Agregar filtro',
Expand Down
23 changes: 12 additions & 11 deletions packages/x-data-grid/src/locales/ptBR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ const ptBRGrid: Partial<GridLocaleText> = {
toolbarQuickFilterDeleteIconLabel: 'Limpar',

// Prompt toolbar field
// toolbarPromptControlPlaceholder: 'Type a prompt…',
// toolbarPromptControlWithRecordingPlaceholder: 'Type or record a prompt…',
// toolbarPromptControlRecordingPlaceholder: 'Listening for prompt…',
// toolbarPromptControlLabel: 'Prompt input',
// toolbarPromptControlDeleteIconLabel: 'Clear',
// toolbarPromptControlRecordButtonDefaultLabel: 'Record',
// toolbarPromptControlRecordButtonActiveLabel: 'Stop recording',
// toolbarPromptControlSendActionLabel: 'Send',
// toolbarPromptControlSendActionAriaLabel: 'Send prompt',
// toolbarPromptControlErrorMessage: 'An error occurred while processing the request. Please try again with a different prompt.',
toolbarPromptControlPlaceholder: 'Digite um prompt…',
toolbarPromptControlWithRecordingPlaceholder: 'Digite ou grave um prompt…',
toolbarPromptControlRecordingPlaceholder: 'Ouvindo o prompt…',
toolbarPromptControlLabel: 'Entrada de prompt',
toolbarPromptControlDeleteIconLabel: 'Limpar',
toolbarPromptControlRecordButtonDefaultLabel: 'Gravar',
toolbarPromptControlRecordButtonActiveLabel: 'Parar gravação',
toolbarPromptControlSendActionLabel: 'Enviar',
toolbarPromptControlSendActionAriaLabel: 'Enviar prompt',
toolbarPromptControlErrorMessage:
'Ocorreu um erro ao processar a solicitação. Por favor, tente novamente com um prompt diferente.',

// Export selector toolbar button text
toolbarExport: 'Exportar',
Expand All @@ -55,7 +56,7 @@ const ptBRGrid: Partial<GridLocaleText> = {
columnsManagementNoColumns: 'Nenhuma coluna',
columnsManagementShowHideAllText: 'Mostrar/Ocultar Todas',
columnsManagementReset: 'Redefinir',
// columnsManagementDeleteIconLabel: 'Clear',
columnsManagementDeleteIconLabel: 'Limpar',

// Filter panel text
filterPanelAddFilter: 'Adicionar filtro',
Expand Down
23 changes: 12 additions & 11 deletions packages/x-data-grid/src/locales/ptPT.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,17 @@ const ptPTGrid: Partial<GridLocaleText> = {
toolbarQuickFilterDeleteIconLabel: 'Claro',

// Prompt toolbar field
// toolbarPromptControlPlaceholder: 'Type a prompt…',
// toolbarPromptControlWithRecordingPlaceholder: 'Type or record a prompt…',
// toolbarPromptControlRecordingPlaceholder: 'Listening for prompt…',
// toolbarPromptControlLabel: 'Prompt input',
// toolbarPromptControlDeleteIconLabel: 'Clear',
// toolbarPromptControlRecordButtonDefaultLabel: 'Record',
// toolbarPromptControlRecordButtonActiveLabel: 'Stop recording',
// toolbarPromptControlSendActionLabel: 'Send',
// toolbarPromptControlSendActionAriaLabel: 'Send prompt',
// toolbarPromptControlErrorMessage: 'An error occurred while processing the request. Please try again with a different prompt.',
toolbarPromptControlPlaceholder: 'Digite um prompt…',
toolbarPromptControlWithRecordingPlaceholder: 'Digite ou grave um prompt…',
toolbarPromptControlRecordingPlaceholder: 'Ouvindo o prompt…',
toolbarPromptControlLabel: 'Entrada de prompt',
toolbarPromptControlDeleteIconLabel: 'Limpar',
toolbarPromptControlRecordButtonDefaultLabel: 'Gravar',
toolbarPromptControlRecordButtonActiveLabel: 'Parar gravação',
toolbarPromptControlSendActionLabel: 'Enviar',
toolbarPromptControlSendActionAriaLabel: 'Enviar prompt',
toolbarPromptControlErrorMessage:
'Ocorreu um erro ao processar a solicitação. Por favor, tente novamente com um prompt diferente.',

// Export selector toolbar button text
toolbarExport: 'Exportar',
Expand All @@ -55,7 +56,7 @@ const ptPTGrid: Partial<GridLocaleText> = {
columnsManagementNoColumns: 'Sem colunas',
columnsManagementShowHideAllText: 'Mostrar/Ocultar Todas',
columnsManagementReset: 'Repor',
// columnsManagementDeleteIconLabel: 'Clear',
columnsManagementDeleteIconLabel: 'Limpar',

// Filter panel text
filterPanelAddFilter: 'Adicionar filtro',
Expand Down
14 changes: 7 additions & 7 deletions packages/x-date-pickers/src/locales/nlNL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ const nlNLPickers: Partial<PickersLocaleText> = {
// DateRange labels
start: 'Start',
end: 'Einde',
startDate: 'Start datum',
startTime: 'Start tijd',
endDate: 'Eind datum',
endTime: 'Eind tijd',
startDate: 'Startdatum',
startTime: 'Starttijd',
endDate: 'Einddatum',
endTime: 'Eindtijd',

// Action bar
cancelButtonLabel: 'Annuleren',
Expand Down Expand Up @@ -70,11 +70,11 @@ const nlNLPickers: Partial<PickersLocaleText> = {
dateTableLabel: 'kies datum',

// Field section placeholders
fieldYearPlaceholder: (params) => 'Y'.repeat(params.digitAmount),
fieldYearPlaceholder: (params) => 'J'.repeat(params.digitAmount),
fieldMonthPlaceholder: (params) => (params.contentType === 'letter' ? 'MMMM' : 'MM'),
fieldDayPlaceholder: () => 'DD',
fieldWeekDayPlaceholder: (params) => (params.contentType === 'letter' ? 'EEEE' : 'EE'),
fieldHoursPlaceholder: () => 'hh',
fieldHoursPlaceholder: () => 'uu',
fieldMinutesPlaceholder: () => 'mm',
fieldSecondsPlaceholder: () => 'ss',
fieldMeridiemPlaceholder: () => 'aa',
Expand All @@ -90,7 +90,7 @@ const nlNLPickers: Partial<PickersLocaleText> = {
meridiem: 'Middag',

// Common
empty: 'Legen',
empty: 'Leeg',
};

export const nlNL = getPickersLocalization(nlNLPickers);

0 comments on commit 0880afb

Please sign in to comment.