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 0c4c5f91d..04ac9c76a 100644 --- a/frontend/src/App/AppUpdatedModalContent.js +++ b/frontend/src/App/AppUpdatedModalContent.js @@ -9,6 +9,7 @@ import ModalHeader from 'Components/Modal/ModalHeader'; import { kinds } from 'Helpers/Props'; import UpdateChanges from 'System/Updates/UpdateChanges'; import translate from 'Utilities/String/translate'; +import InlineMarkdown from 'Components/Markdown/InlineMarkdown'; import styles from './AppUpdatedModalContent.css'; function mergeUpdates(items, version, prevVersion) { @@ -64,20 +65,20 @@ function AppUpdatedModalContent(props) { return ( - {translate('RadarrUpdated')} + {translate('AppUpdated', { appName: 'Radarr' })} -
${version}`]) }} /> +
+ +
{ isPopulated && !error && !!update &&
{ !update.changes && -
- {translate('MaintenanceRelease')} -
+
{translate('MaintenanceRelease')}
} { diff --git a/frontend/src/App/ConnectionLostModal.js b/frontend/src/App/ConnectionLostModal.js index 16adf78f5..cf691a125 100644 --- a/frontend/src/App/ConnectionLostModal.js +++ b/frontend/src/App/ConnectionLostModal.js @@ -28,11 +28,11 @@ function ConnectionLostModal(props) {
- {translate('ConnectionLostMessage')} + {translate('ConnectionLostToBackend', { appName: 'Radarr' })}
- {translate('ConnectionLostAutomaticMessage')} + {translate('ConnectionLostReconnect', { appName: 'Radarr' })}
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 98f12a7dd..1b107ec20 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -59,6 +59,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", "Apply": "Apply", @@ -182,8 +184,8 @@ "ConnectSettingsSummary": "Notifications, connections to media servers/players, and custom scripts", "Connection": "Connection", "ConnectionLost": "Connection Lost", - "ConnectionLostAutomaticMessage": "Radarr will try to connect automatically, or you can click reload below.", - "ConnectionLostMessage": "Radarr has lost its connection to the backend and will need to be reloaded to restore functionality.", + "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", "ConsideredAvailable": "Considered Available", "CopyToClipboard": "Copy to Clipboard", @@ -891,7 +893,6 @@ "RadarrSupportsAnyRSSMovieListsAsWellAsTheOneStatedBelow": "Radarr supports any RSS movie lists as well as the one stated below.", "RadarrSupportsCustomConditionsAgainstTheReleasePropertiesBelow": "Radarr supports custom conditions against the release properties below.", "RadarrTags": "Radarr Tags", - "RadarrUpdated": "Radarr Updated", "Rating": "Rating", "Ratings": "Ratings", "ReadTheWikiForMoreInformation": "Read the Wiki for more information", @@ -1306,7 +1307,6 @@ "UsenetDisabled": "Usenet Disabled", "Username": "Username", "Version": "Version", - "VersionUpdateText": "Version {0} of Radarr has been installed, in order to get the latest changes you'll need to reload Radarr.", "VideoCodec": "Video Codec", "VideoDynamicRange": "Video Dynamic Range", "View": "View",