From effc2b26a18025054df7b3a8c1d14c0a308dc07d Mon Sep 17 00:00:00 2001 From: Filip Solecki Date: Thu, 5 Sep 2024 14:51:27 +0200 Subject: [PATCH 1/3] Fix column header going out of screen --- src/components/ImportColumn.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ImportColumn.tsx b/src/components/ImportColumn.tsx index f25082f94474..50f385ff929d 100644 --- a/src/components/ImportColumn.tsx +++ b/src/components/ImportColumn.tsx @@ -181,7 +181,7 @@ function ImportColumn({column, columnName, columnRoles, columnIndex}: ImportColu {columnValuesString} From b32d611ae54b34827bf99d427b4aa76b88c7d061 Mon Sep 17 00:00:00 2001 From: Filip Solecki Date: Thu, 5 Sep 2024 14:52:14 +0200 Subject: [PATCH 2/3] Fix some translations --- src/components/ImportSpreadsheet.tsx | 2 +- src/languages/en.ts | 1 + src/languages/es.ts | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx index fd75bfc2d3b5..8661f921b7fa 100644 --- a/src/components/ImportSpreadsheet.tsx +++ b/src/components/ImportSpreadsheet.tsx @@ -65,7 +65,7 @@ function ImportSpreedsheet({backTo, goTo}: ImportSpreedsheetProps) { } if ((file?.size ?? 0) <= 0) { - setUploadFileError(true, 'attachmentPicker.attachmentTooSmall', 'attachmentPicker.sizeNotMet'); + setUploadFileError(true, 'attachmentPicker.attachmentTooSmall', 'spreadsheet.sizeNotMet'); return false; } return true; diff --git a/src/languages/en.ts b/src/languages/en.ts index 7a745bbd00c0..e483e54fdd70 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -687,6 +687,7 @@ export default { importCategoriesSuccessfullDescription: (categories: number) => (categories > 1 ? `${categories} categories have been added.` : '1 category has been added.'), importFailedTitle: 'Import failed', importFailedDescription: 'Please ensure all fields are filled out correctly and try again. If the problem persists, please reach out to Concierge.', + sizeNotMet: 'File size must be greater than 0 bytes', invalidFileMessage: 'The file you uploaded is either empty or contains invalid data. Please ensure that the file is correctly formatted and contains the necessary information before uploading it again.', }, diff --git a/src/languages/es.ts b/src/languages/es.ts index ecdd1f5f4c04..ac1fe7d9c6e7 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -680,8 +680,9 @@ export default { importFailedDescription: 'Por favor, asegúrate de que todos los campos estén llenos correctamente e inténtalo de nuevo. Si el problema persiste, por favor contacta a Concierge.', importCategoriesSuccessfullDescription: (categories: number) => (categories > 1 ? `Se han agregado ${categories} categorías.` : 'Se ha agregado 1 categoría.'), importSuccessfullTitle: 'Importar categorías', + sizeNotMet: 'El archivo adjunto debe ser más grande que 0 bytes.', invalidFileMessage: - 'El archivo que ha cargado está vacío o contiene datos no válidos. Asegúrese de que el archivo tiene el formato correcto y contiene la información necesaria antes de volver a cargarlo.', + 'El archivo que subiste está vacío o contiene datos no válidos. Asegúrate de que el archivo esté correctamente formateado y contenga la información necesaria antes de volver a subirlo.', }, receipt: { upload: 'Subir recibo', From 0ecea56cad0db9412b8498f5564cd4482329a806 Mon Sep 17 00:00:00 2001 From: Wiktor Gut Date: Tue, 10 Sep 2024 20:00:03 +0200 Subject: [PATCH 3/3] change column lines to 1 --- src/components/ImportColumn.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/ImportColumn.tsx b/src/components/ImportColumn.tsx index 8f86ab9218ea..49601787a207 100644 --- a/src/components/ImportColumn.tsx +++ b/src/components/ImportColumn.tsx @@ -176,7 +176,12 @@ function ImportColumn({column, columnName, columnRoles, columnIndex}: ImportColu return ( - {columnHeader} + + {columnHeader} +