From 2f7a405fdd311970e5da1b846ff2cfcff0fcdce2 Mon Sep 17 00:00:00 2001 From: Stevie Robinson Date: Tue, 18 Jul 2023 20:52:40 +0200 Subject: [PATCH] adjusted translations to include variables switch netcore to dotnetversion --- frontend/src/System/Logs/Files/LogFiles.js | 4 +++- frontend/src/System/Status/About/About.js | 11 +++++++++-- src/NzbDrone.Core/Localization/Core/en.json | 4 +++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/frontend/src/System/Logs/Files/LogFiles.js b/frontend/src/System/Logs/Files/LogFiles.js index 731a555bf..45c61c321 100644 --- a/frontend/src/System/Logs/Files/LogFiles.js +++ b/frontend/src/System/Logs/Files/LogFiles.js @@ -77,7 +77,9 @@ class LogFiles extends Component {
- {translate('LogFilesLocation')}: {location} + {translate('LogFilesLocation', { + location + })}
{ diff --git a/frontend/src/System/Status/About/About.js b/frontend/src/System/Status/About/About.js index d592ddd0b..b0b289135 100644 --- a/frontend/src/System/Status/About/About.js +++ b/frontend/src/System/Status/About/About.js @@ -42,14 +42,21 @@ class About extends Component { packageVersion && {packageVersion} {translate('by')} : packageVersion)} + data={(packageAuthor ? + : + packageVersion + )} /> } { isNetCore && } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 7dcab54d3..9994c4bc2 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -73,6 +73,7 @@ "Docker": "Docker", "DockerUpdater": "Update the docker container to receive the update", "Donations": "Donations", + "DotNetVersion": ".NET", "Download": "Download", "DownloadClientCheckNoneAvailableHealthCheckMessage": "No download client is available", "DownloadClientCheckUnableToCommunicateWithHealthCheckMessage": "Unable to communicate with {0}.", @@ -148,7 +149,7 @@ "LibraryImport": "Library Import", "Location": "Location", "LogFiles": "Log Files", - "LogFilesLocation": "Log files are located in", + "LogFilesLocation": "Log files are located in: {location}", "Logs": "Logs", "MaintenanceRelease": "Maintenance Release: bug fixes and other improvements. See Github Commit History for more details", "ManageClients": "Manage Clients", @@ -192,6 +193,7 @@ "Options": "Options", "OriginalLanguage": "Original Language", "PackageVersion": "Package Version", + "PackageVersionInfo": "{packageVersion} by {packageAuthor}", "PartialSeason": "Partial Season", "Path": "Path", "PreviousAiring": "Previous Airing",