diff --git a/frontend/src/Movie/Delete/DeleteMovieModalContent.js b/frontend/src/Movie/Delete/DeleteMovieModalContent.js index 7474f61ce..4c1f15cc5 100644 --- a/frontend/src/Movie/Delete/DeleteMovieModalContent.js +++ b/frontend/src/Movie/Delete/DeleteMovieModalContent.js @@ -54,22 +54,18 @@ class DeleteMovieModalContent extends Component { const { title, path, - statistics, + hasFile, + sizeOnDisk, onModalClose } = this.props; - const { - movieFileCount, - sizeOnDisk - } = statistics; - const deleteFiles = this.state.deleteFiles; const addImportExclusion = this.state.addImportExclusion; - let deleteFilesLabel = translate('DeleteFilesLabel', [movieFileCount]); + let deleteFilesLabel = hasFile ? translate('DeleteFileLabel', [1]) : translate('DeleteFilesLabel', [0]); let deleteFilesHelpText = translate('DeleteFilesHelpText'); - if (movieFileCount === 0) { + if (!hasFile) { deleteFilesLabel = translate('DeleteMovieFolderLabel'); deleteFilesHelpText = translate('DeleteMovieFolderHelpText'); } @@ -92,6 +88,21 @@ class DeleteMovieModalContent extends Component { {path} + + + {translate('AddListExclusion')} + + + + + {deleteFilesLabel} @@ -113,29 +124,14 @@ class DeleteMovieModalContent extends Component { { - !!movieFileCount && + !!hasFile &&
- {movieFileCount} {translate('MovieFilesTotaling')} {formatBytes(sizeOnDisk)} + {hasFile} {translate('MovieFilesTotaling')} {formatBytes(sizeOnDisk)}
} } - - - {translate('AddListExclusion')} - - - - - @@ -158,15 +154,10 @@ class DeleteMovieModalContent extends Component { DeleteMovieModalContent.propTypes = { title: PropTypes.string.isRequired, path: PropTypes.string.isRequired, - statistics: PropTypes.object.isRequired, + hasFile: PropTypes.bool.isRequired, + sizeOnDisk: PropTypes.string.isRequired, onDeletePress: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired }; -DeleteMovieModalContent.defaultProps = { - statistics: { - movieFileCount: 0 - } -}; - export default DeleteMovieModalContent; diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index f5adfa6d0..e50c88033 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -195,6 +195,7 @@ "DeleteEmptyFolders": "Delete empty folders", "DeleteEmptyFoldersHelpText": "Delete empty movie folders during disk scan and when movie files are deleted", "DeleteFile": "Delete file", + "DeleteFileLabel": "Delete {0} Movie File", "DeleteFilesHelpText": "Delete the movie files and movie folder", "DeleteFilesLabel": "Delete {0} Movie Files", "DeleteHeader": "Delete - {0}",