diff --git a/frontend/src/App/AppUpdatedModalContent.css b/frontend/src/App/AppUpdatedModalContent.css index 37b89c9be..0df4183a6 100644 --- a/frontend/src/App/AppUpdatedModalContent.css +++ b/frontend/src/App/AppUpdatedModalContent.css @@ -1,6 +1,7 @@ .version { margin: 0 3px; font-weight: bold; + font-family: var(--defaultFontFamily); } .maintenance { diff --git a/frontend/src/App/AppUpdatedModalContent.js b/frontend/src/App/AppUpdatedModalContent.js index 3a6eda94f..721e25aea 100644 --- a/frontend/src/App/AppUpdatedModalContent.js +++ b/frontend/src/App/AppUpdatedModalContent.js @@ -2,6 +2,7 @@ import PropTypes from 'prop-types'; import React from 'react'; 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'; @@ -64,12 +65,12 @@ function AppUpdatedModalContent(props) { return ( - Readarr Updated + {translate('AppUpdated', { appName: 'Readarr' })}
- Version {version} of Readarr has been installed, in order to get the latest changes you'll need to reload Readarr. +
{ @@ -77,16 +78,14 @@ function AppUpdatedModalContent(props) {
{ !update.changes && -
- {translate('MaintenanceRelease')} -
+
{translate('MaintenanceRelease')}
} { !!update.changes &&
- What's new? + {translate('WhatsNew')}
- Recent Changes + {translate('RecentChanges')} diff --git a/frontend/src/App/ConnectionLostModal.js b/frontend/src/App/ConnectionLostModal.js index 2b8adb49b..c79f44681 100644 --- a/frontend/src/App/ConnectionLostModal.js +++ b/frontend/src/App/ConnectionLostModal.js @@ -7,6 +7,7 @@ import ModalContent from 'Components/Modal/ModalContent'; import ModalFooter from 'Components/Modal/ModalFooter'; import ModalHeader from 'Components/Modal/ModalHeader'; import { kinds } from 'Helpers/Props'; +import translate from 'Utilities/String/translate'; import styles from './ConnectionLostModal.css'; function ConnectionLostModal(props) { @@ -22,16 +23,16 @@ function ConnectionLostModal(props) { > - Connection Lost + {translate('ConnectionLost')}
- Readarr has lost its connection to the backend and will need to be reloaded to restore functionality. + {translate('ConnectionLostToBackend', { appName: 'Readarr' })}
- Readarr will try to connect automatically, or you can click reload below. + {translate('ConnectionLostReconnect', { appName: 'Readarr' })}
@@ -39,7 +40,7 @@ function ConnectionLostModal(props) { kind={kinds.PRIMARY} onPress={onModalClose} > - Reload + {translate('Reload')}
diff --git a/frontend/src/Components/Markdown/InlineMarkdown.js b/frontend/src/Components/Markdown/InlineMarkdown.js index 082f0bb88..993bb241e 100644 --- a/frontend/src/Components/Markdown/InlineMarkdown.js +++ b/frontend/src/Components/Markdown/InlineMarkdown.js @@ -10,7 +10,8 @@ class InlineMarkdown extends Component { render() { const { className, - data + data, + blockClassName } = this.props; // For now only replace links or code blocks (not both) @@ -47,7 +48,7 @@ class InlineMarkdown extends Component { markdownBlocks.push(data.substr(endIndex, match.index - endIndex)); } - markdownBlocks.push({match[0].substring(1, match[0].length - 1)}); + markdownBlocks.push({match[0].substring(1, match[0].length - 1)}); endIndex = match.index + match[0].length; } @@ -66,7 +67,8 @@ class InlineMarkdown extends Component { InlineMarkdown.propTypes = { className: PropTypes.string, - data: PropTypes.string + data: PropTypes.string, + blockClassName: PropTypes.string }; export default InlineMarkdown; diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 31df78c97..9816691fd 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -37,6 +37,8 @@ "ApiKeyValidationHealthCheckMessage": "Please update your API key to be at least {0} characters long. You can do this via settings or the config file", "AppDataDirectory": "AppData directory", "AppDataLocationHealthCheckMessage": "Updating will not be possible to prevent deleting AppData on Update", + "AppUpdated": "{appName} Updated", + "AppUpdatedVersion": "{appName} has been updated to version `{version}`, in order to get the latest changes you'll need to reload {appName}", "ApplicationURL": "Application URL", "ApplicationUrlHelpText": "This application's external URL including http(s)://, port and URL base", "ApplyChanges": "Apply Changes", @@ -150,6 +152,9 @@ "Connect": "Connect", "ConnectSettings": "Connect Settings", "ConnectSettingsSummary": "Notifications, connections to media servers/players and custom scripts", + "ConnectionLost": "Connection Lost", + "ConnectionLostReconnect": "{appName} will try to connect automatically, or you can click reload below.", + "ConnectionLostToBackend": "{appName} has lost its connection to the backend and will need to be reloaded to restore functionality.", "Connections": "Connections", "ConsoleLogLevel": "Console Log Level", "Continuing": "Continuing", @@ -670,6 +675,7 @@ "ReadarrTags": "Readarr Tags", "Real": "Real", "Reason": "Reason", + "RecentChanges": "Recent Changes", "RecycleBinCleanupDaysHelpText": "Set to 0 to disable automatic cleanup", "RecycleBinCleanupDaysHelpTextWarning": "Files in the recycle bin older than the selected number of days will be cleaned up automatically", "RecycleBinHelpText": "Book files will go here when deleted instead of being permanently deleted", @@ -996,6 +1002,7 @@ "WatchLibraryForChangesHelpText": "Rescan automatically when files change in a root folder", "WatchRootFoldersForFileChanges": "Watch Root Folders for file changes", "WeekColumnHeader": "Week Column Header", + "WhatsNew": "What's New?", "WouldYouLikeToRestoreBackup": "Would you like to restore the backup '{name}'?", "WriteAudioTags": "Tag Audio Files with Metadata", "WriteAudioTagsScrub": "Scrub Existing Tags",