diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js index e2c39b0bb..86e968ae9 100644 --- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js @@ -76,7 +76,7 @@ function EditImportListExclusionModalContent(props) { - {translate('MusicbrainzId')} + {translate('ForeignId')} - { - new ValidationFailure("MusicbrainzId", "An author with this ID was not found", newAuthor.Metadata.Value.ForeignAuthorId) - }); + { + new ("ForeignAuthorId", "An author with this ID was not found", newAuthor.Metadata.Value.ForeignAuthorId) + }); } author.ApplyChanges(newAuthor); diff --git a/src/NzbDrone.Core/Exceptions/AuthorNotFoundException.cs b/src/NzbDrone.Core/Exceptions/AuthorNotFoundException.cs index 4a1593ae6..733b5400d 100644 --- a/src/NzbDrone.Core/Exceptions/AuthorNotFoundException.cs +++ b/src/NzbDrone.Core/Exceptions/AuthorNotFoundException.cs @@ -4,24 +4,24 @@ namespace NzbDrone.Core.Exceptions { public class AuthorNotFoundException : NzbDroneException { - public string MusicBrainzId { get; set; } + public string ForeignAuthorId { get; set; } - public AuthorNotFoundException(string musicbrainzId) - : base(string.Format("Author with id {0} was not found, it may have been removed from the metadata server.", musicbrainzId)) + public AuthorNotFoundException(string foreignAuthorId) + : base($"Author with id {foreignAuthorId} was not found, it may have been removed from the metadata server.") { - MusicBrainzId = musicbrainzId; + ForeignAuthorId = foreignAuthorId; } - public AuthorNotFoundException(string musicbrainzId, string message, params object[] args) + public AuthorNotFoundException(string foreignAuthorId, string message, params object[] args) : base(message, args) { - MusicBrainzId = musicbrainzId; + ForeignAuthorId = foreignAuthorId; } - public AuthorNotFoundException(string musicbrainzId, string message) + public AuthorNotFoundException(string foreignAuthorId, string message) : base(message) { - MusicBrainzId = musicbrainzId; + ForeignAuthorId = foreignAuthorId; } } } diff --git a/src/NzbDrone.Core/Exceptions/BookNotFoundException.cs b/src/NzbDrone.Core/Exceptions/BookNotFoundException.cs index 7e48b04df..6c3a26424 100644 --- a/src/NzbDrone.Core/Exceptions/BookNotFoundException.cs +++ b/src/NzbDrone.Core/Exceptions/BookNotFoundException.cs @@ -4,24 +4,24 @@ namespace NzbDrone.Core.Exceptions { public class BookNotFoundException : NzbDroneException { - public string MusicBrainzId { get; set; } + public string ForeignBookId { get; set; } - public BookNotFoundException(string musicbrainzId) - : base(string.Format("Book with id {0} was not found, it may have been removed from metadata server.", musicbrainzId)) + public BookNotFoundException(string foreignBookId) + : base($"Book with id {foreignBookId} was not found, it may have been removed from metadata server.") { - MusicBrainzId = musicbrainzId; + ForeignBookId = foreignBookId; } - public BookNotFoundException(string musicbrainzId, string message, params object[] args) + public BookNotFoundException(string foreignBookId, string message, params object[] args) : base(message, args) { - MusicBrainzId = musicbrainzId; + ForeignBookId = foreignBookId; } - public BookNotFoundException(string musicbrainzId, string message) + public BookNotFoundException(string foreignBookId, string message) : base(message) { - MusicBrainzId = musicbrainzId; + ForeignBookId = foreignBookId; } } } diff --git a/src/NzbDrone.Core/Exceptions/EditionNotFoundException.cs b/src/NzbDrone.Core/Exceptions/EditionNotFoundException.cs index 98f399fc7..b7063c140 100644 --- a/src/NzbDrone.Core/Exceptions/EditionNotFoundException.cs +++ b/src/NzbDrone.Core/Exceptions/EditionNotFoundException.cs @@ -4,24 +4,24 @@ namespace NzbDrone.Core.Exceptions { public class EditionNotFoundException : NzbDroneException { - public string MusicBrainzId { get; set; } + public string ForeignEditionId { get; set; } - public EditionNotFoundException(string musicbrainzId) - : base(string.Format("Edition with id {0} was not found, it may have been removed from metadata server.", musicbrainzId)) + public EditionNotFoundException(string foreignEditionId) + : base($"Edition with id {foreignEditionId} was not found, it may have been removed from metadata server.") { - MusicBrainzId = musicbrainzId; + ForeignEditionId = foreignEditionId; } - public EditionNotFoundException(string musicbrainzId, string message, params object[] args) + public EditionNotFoundException(string foreignEditionId, string message, params object[] args) : base(message, args) { - MusicBrainzId = musicbrainzId; + ForeignEditionId = foreignEditionId; } - public EditionNotFoundException(string musicbrainzId, string message) + public EditionNotFoundException(string foreignEditionId, string message) : base(message) { - MusicBrainzId = musicbrainzId; + ForeignEditionId = foreignEditionId; } } } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index fd45fbf8e..31cee6482 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -394,7 +394,7 @@ "ForMoreInformationOnTheIndividualIndexersClickOnTheInfoButtons": "For more information on the individual indexers, click on the info buttons.", "ForMoreInformationOnTheIndividualListsClickOnTheInfoButtons": "For more information on the individual lists, click on the info buttons.", "ForeignId": "Foreign ID", - "ForeignIdHelpText": "The Musicbrainz Id of the author/book to exclude", + "ForeignIdHelpText": "The Foreign Id of the author/book to exclude", "Formats": "Formats", "FreeSpace": "Free Space", "FutureBooks": "Future Books", @@ -619,7 +619,6 @@ "MusicBrainzRecordingID": "MusicBrainz Recording ID", "MusicBrainzReleaseID": "MusicBrainz Release ID", "MusicBrainzTrackID": "MusicBrainz Track ID", - "MusicbrainzId": "Musicbrainz Id", "MustContain": "Must Contain", "MustNotContain": "Must Not Contain", "NETCore": ".NET Core",