diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js index 374b5b98b1..3445759eee 100644 --- a/src/components/itemContextMenu.js +++ b/src/components/itemContextMenu.js @@ -11,11 +11,14 @@ import ServerConnections from './ServerConnections'; import toast from './toast/toast'; import * as userSettings from '../scripts/settings/userSettings'; -function getDeleteCommandName(type) { +function getDeleteLabel(type) { switch (type) { case 'Series': return globalize.translate('DeleteSeries'); + case 'Episode': + return globalize.translate('DeleteEpisode'); + case 'Playlist': case 'BoxSet': return globalize.translate('Delete'); @@ -175,7 +178,7 @@ export function getCommands(options) { if (item.CanDelete && options.deleteItem !== false) { commands.push({ - name: getDeleteCommandName(item.Type), + name: getDeleteLabel(item.Type), id: 'delete', icon: 'delete' }); diff --git a/src/scripts/deleteHelper.js b/src/scripts/deleteHelper.js index 90bf30e1b6..ddafdc537c 100644 --- a/src/scripts/deleteHelper.js +++ b/src/scripts/deleteHelper.js @@ -9,40 +9,32 @@ function alertText(options) { return alert(options); } -function getDeleteText(item) { +function getDeletionConfirmContent(item) { if (item.Type === 'Series') { const totalEpisodes = item.RecursiveItemCount; - return { title: globalize.translate('HeaderDeleteSeries'), text: globalize.translate('ConfirmDeleteSeries', totalEpisodes), - confirmText: globalize.translate('DeleteEntireSeries', totalEpisodes) + confirmText: globalize.translate('DeleteEntireSeries', totalEpisodes), + primary: 'delete' }; } return { title: globalize.translate('HeaderDeleteItem'), text: globalize.translate('ConfirmDeleteItem'), - confirmText: globalize.translate('Delete') - + confirmText: globalize.translate('Delete'), + primary: 'delete' }; } export function deleteItem(options) { const item = options.item; const parentId = item.SeasonId || item.SeriesId || item.ParentId; - const { confirmText, text, title } = getDeleteText(item); const apiClient = ServerConnections.getApiClient(item.ServerId); - return confirm({ - - title, - text, - confirmText, - primary: 'delete' - - }).then(function () { + return confirm(getDeletionConfirmContent(item)).then(function () { return apiClient.deleteItem(item.Id).then(function () { if (options.navigate) { if (parentId) { diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 8125a12c0e..d1a08791c7 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -185,6 +185,7 @@ "DeleteImageConfirmation": "Are you sure you wish to delete this image?", "DeleteMedia": "Delete media", "DeleteSeries": "Delete Series", + "DeleteEpisode": "Delete Episode", "DeleteUser": "Delete User", "DeleteUserConfirmation": "Are you sure you wish to delete this user?", "Depressed": "Depressed",