Skip to content

Commit 6c729d9

Browse files
authored
Change delete confirmation message (#412)
1 parent 231a24b commit 6c729d9

File tree

3 files changed

+16
-70
lines changed

3 files changed

+16
-70
lines changed

src/components/dialogs/delete-dialog.js

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,8 @@ const DeleteDialog = ({
7474
onClick();
7575
};
7676

77-
const buildTitle = (items) => {
78-
return items.length === 1
79-
? intl.formatMessage(
80-
{ id: 'deleteItemDialogTitle' },
81-
{
82-
itemName: (
83-
<OverflowableText
84-
text={items[0].elementName}
85-
tooltipSx={styles.tooltip}
86-
/>
87-
),
88-
}
89-
)
90-
: intl.formatMessage(
91-
{ id: 'deleteMultipleItemsDialogTitle' },
92-
{ itemsCount: items.length }
93-
);
77+
const buildTitle = () => {
78+
return intl.formatMessage({ id: 'deleteDialogTitle' });
9479
};
9580

9681
const renderElement = (items) => {
@@ -125,48 +110,11 @@ const DeleteDialog = ({
125110
<Grid>
126111
<Grid item>
127112
<span>
128-
{intl.formatMessage(
129-
{
130-
id: multipleDeleteFormatMessageId,
131-
},
132-
{ itemsCount: items.length }
133-
)}
113+
{intl.formatMessage({
114+
id: multipleDeleteFormatMessageId,
115+
})}
134116
</span>
135117
</Grid>
136-
{items.slice(0, 10).map((file) => (
137-
<Grid item key={file.elementUuid}>
138-
<span>
139-
{
140-
<div
141-
style={{
142-
overflow: 'hidden',
143-
textOverflow: 'ellipsis',
144-
}}
145-
>
146-
{
147-
<OverflowableText
148-
text={file.elementName}
149-
style={{ width: '100%' }}
150-
tooltipSx={styles.tooltip}
151-
/>
152-
}
153-
</div>
154-
}
155-
</span>
156-
</Grid>
157-
))}
158-
{items.length > 10 && (
159-
<Grid item>
160-
<span>
161-
{intl.formatMessage(
162-
{
163-
id: 'additionalItems',
164-
},
165-
{ itemsCount: items.length - 10 }
166-
)}
167-
</span>
168-
</Grid>
169-
)}
170118
</Grid>
171119
) : (
172120
<Grid>
@@ -198,7 +146,7 @@ const DeleteDialog = ({
198146
aria-labelledby="dialog-title-delete"
199147
>
200148
<DialogTitle style={{ display: 'flex' }}>
201-
{buildTitle(itemsState)}
149+
{buildTitle()}
202150
</DialogTitle>
203151
<DialogContent>
204152
{buildItemsToDeleteGrid(

src/translations/en.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,11 @@
6565
"confirmDirectoryDialog": "Confirm",
6666
"insertNewDirectoryDialogTitle": "Create folder",
6767
"insertNewRootDirectoryDialogTitle": "Create root folder",
68-
"deleteDirectoryDialogMessage": "The {itemName} folder and the items it contains will be deleted.",
69-
"deleteMultipleDirectoriesDialogMessage": "{itemsCount} folders and the items they contain will be deleted.",
70-
"deleteItemDialogMessage": "{itemName} will be deleted.",
71-
"deleteMultipleItemsDialogMessage": "{itemsCount} items will be deleted.",
72-
"deleteItemDialogTitle": "Delete\u00a0{itemName}",
73-
"deleteMultipleItemsDialogTitle": "Delete {itemsCount} items",
68+
"deleteDirectoryDialogMessage": "The {itemName} folder and the items it contains will be deleted permanently.",
69+
"deleteMultipleDirectoriesDialogMessage": "All selected folders and the items they contain will be deleted permanently.",
70+
"deleteItemDialogMessage": "The selected item will be deleted permanently.",
71+
"deleteMultipleItemsDialogMessage": "All selected items will be deleted permanently.",
72+
"deleteDialogTitle": "Confirmation",
7473
"renameDirectoryDialogTitle": "Rename the folder",
7574
"accessRights": "Access rights",
7675
"modifyDirectoryAccessRightsError": "You are not the owner of the directory",

src/translations/fr.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,11 @@
6565
"renameFolder": "Renommer",
6666
"insertNewDirectoryDialogTitle": "Créer un dossier",
6767
"insertNewRootDirectoryDialogTitle": "Créer un dossier racine",
68-
"deleteDirectoryDialogMessage": "Le dossier {itemName} ainsi que les éléments qu'il contient va être supprimé.",
69-
"deleteMultipleDirectoriesDialogMessage": "{itemsCount} dossiers ainsi que les éléments qu'ils contiennent vont être supprimés.",
70-
"deleteItemDialogMessage": "{itemName} va être supprimé.",
71-
"deleteMultipleItemsDialogMessage": "{itemsCount} éléments vont être supprimés.",
72-
"deleteItemDialogTitle": "Supprimer\u00a0{itemName}",
73-
"deleteMultipleItemsDialogTitle": "Supprimer {itemsCount} éléments",
68+
"deleteDirectoryDialogMessage": "Le dossier {itemName} ainsi que les éléments qu'il contient vont être supprimés définitivement.",
69+
"deleteMultipleDirectoriesDialogMessage": "Tous les dossiers sélectionnés ainsi que les éléments qu'ils contiennent vont être supprimés définitivement.",
70+
"deleteItemDialogMessage": "L'élement sélectionné va être supprimé définitivement.",
71+
"deleteMultipleItemsDialogMessage": "Tous les éléments sélectionnés vont être supprimés définitivement.",
72+
"deleteDialogTitle": "Confirmation",
7473
"renameDirectoryDialogTitle": "Renommer le dossier",
7574
"accessRights": "Droits d'accès",
7675
"modifyDirectoryAccessRightsError": "Le dossier ne vous appartient pas",

0 commit comments

Comments
 (0)