diff --git a/frontend/src/Organize/OrganizePreviewModalContent.js b/frontend/src/Organize/OrganizePreviewModalContent.js index d70cb9c42..fc3fbeb6e 100644 --- a/frontend/src/Organize/OrganizePreviewModalContent.js +++ b/frontend/src/Organize/OrganizePreviewModalContent.js @@ -4,6 +4,7 @@ import Alert from 'Components/Alert'; import CheckInput from 'Components/Form/CheckInput'; import Button from 'Components/Link/Button'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; +import InlineMarkdown from 'Components/Markdown/InlineMarkdown'; import ModalBody from 'Components/Modal/ModalBody'; import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; @@ -92,7 +93,7 @@ class OrganizePreviewModalContent extends Component { return ( - {translate('OrganizeAndRename')} + {translate('OrganizeModalHeader')} @@ -103,9 +104,7 @@ class OrganizePreviewModalContent extends Component { { !isFetching && error && -
- {translate('ErrorLoadingPreviews')} -
+
{translate('OrganizeLoadError')}
} { @@ -113,8 +112,8 @@ class OrganizePreviewModalContent extends Component {
{ renameMovies ? -
{translate('OrganizeModalSuccess')}
: -
{translate('OrganizeModalDisabled')}
+
{translate('OrganizeNothingToRename')}
: +
{translate('OrganizeRenamingDisabled')}
}
} @@ -124,17 +123,11 @@ class OrganizePreviewModalContent extends Component {
- {translate('OrganizeModalAllPathsRelative')} - - {path} - +
- {translate('OrganizeModalNamingPattern')} - - {standardMovieFormat} - +
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 72ef6190b..98f12a7dd 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -375,7 +375,6 @@ "Ended": "Ended", "Error": "Error", "ErrorLoadingContents": "Error loading contents", - "ErrorLoadingPreviews": "Error loading previews", "ErrorRestoringBackup": "Error restoring backup", "EventType": "Event Type", "Events": "Events", @@ -787,12 +786,13 @@ "Options": "Options", "Or": "or", "Organize": "Organize", - "OrganizeAndRename": "Organize & Rename", "OrganizeConfirm": "Are you sure you want to organize all files in the {count} selected movie(s)?", - "OrganizeModalAllPathsRelative": "All paths are relative to:", - "OrganizeModalDisabled": "Renaming is disabled, nothing to rename", - "OrganizeModalNamingPattern": "Naming Pattern:", - "OrganizeModalSuccess": "Success! My work is done, no files to rename.", + "OrganizeLoadError": "Error loading previews", + "OrganizeModalHeader": "Organize & Rename", + "OrganizeNamingPattern": "Naming pattern: `{standardMovieFormat}`", + "OrganizeNothingToRename": "Success! My work is done, no files to rename.", + "OrganizeRelativePaths": "All paths are relative to: `{path}`", + "OrganizeRenamingDisabled": "Renaming is disabled, nothing to rename", "OrganizeSelectedMovies": "Organize Selected Movies", "Original": "Original", "OriginalLanguage": "Original Language",