- {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', selectedCount) : translate('RemoveSelectedItemQueueMessageText')}
+ {selectedCount > 1 ? translate('RemoveSelectedItemsQueueMessageText', [selectedCount]) : translate('RemoveSelectedItemQueueMessageText')}
@@ -103,11 +103,11 @@ class RemoveQueueItemsModal extends Component {
@@ -133,10 +133,10 @@ class RemoveQueueItemsModal extends Component {
}
diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js
index 88035e07e..dddc2ee0f 100644
--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -369,15 +369,15 @@ export const actionHandlers = handleThunks({
[REMOVE_QUEUE_ITEM]: function(getState, payload, dispatch) {
const {
id,
- remove,
+ removeFromClient,
blocklist,
- skipredownload
+ skipRedownload
} = payload;
dispatch(updateItem({ section: paged, id, isRemoving: true }));
const promise = createAjaxRequest({
- url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`,
+ url: `/queue/${id}?removeFromClient=${removeFromClient}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`,
method: 'DELETE'
}).request;
@@ -393,9 +393,9 @@ export const actionHandlers = handleThunks({
[REMOVE_QUEUE_ITEMS]: function(getState, payload, dispatch) {
const {
ids,
- remove,
+ removeFromClient,
blocklist,
- skipredownload
+ skipRedownload
} = payload;
dispatch(batchActions([
@@ -411,7 +411,7 @@ export const actionHandlers = handleThunks({
]));
const promise = createAjaxRequest({
- url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`,
+ url: `/queue/bulk?removeFromClient=${removeFromClient}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`,
method: 'DELETE',
dataType: 'json',
contentType: 'application/json',
diff --git a/src/Lidarr.Api.V1/Queue/QueueController.cs b/src/Lidarr.Api.V1/Queue/QueueController.cs
index 82bb75415..4bc5af52a 100644
--- a/src/Lidarr.Api.V1/Queue/QueueController.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueController.cs
@@ -60,9 +60,9 @@ namespace Lidarr.Api.V1.Queue
}
[RestDeleteById]
- public void RemoveAction(int id, bool removeFromClient = true, bool blocklist = false, bool skipReDownload = false)
+ public void RemoveAction(int id, bool removeFromClient = true, bool blocklist = false, bool skipRedownload = false)
{
- var trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload);
+ var trackedDownload = Remove(id, removeFromClient, blocklist, skipRedownload);
if (trackedDownload != null)
{
@@ -71,13 +71,13 @@ namespace Lidarr.Api.V1.Queue
}
[HttpDelete("bulk")]
- public object RemoveMany([FromBody] QueueBulkResource resource, [FromQuery] bool removeFromClient = true, [FromQuery] bool blocklist = false, [FromQuery] bool skipReDownload = false)
+ public object RemoveMany([FromBody] QueueBulkResource resource, [FromQuery] bool removeFromClient = true, [FromQuery] bool blocklist = false, [FromQuery] bool skipRedownload = false)
{
var trackedDownloadIds = new List();
foreach (var id in resource.Ids)
{
- var trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload);
+ var trackedDownload = Remove(id, removeFromClient, blocklist, skipRedownload);
if (trackedDownload != null)
{
@@ -195,7 +195,7 @@ namespace Lidarr.Api.V1.Queue
}
}
- private TrackedDownload Remove(int id, bool removeFromClient, bool blocklist, bool skipReDownload)
+ private TrackedDownload Remove(int id, bool removeFromClient, bool blocklist, bool skipRedownload)
{
var pendingRelease = _pendingReleaseService.FindPendingQueueItem(id);
@@ -227,7 +227,7 @@ namespace Lidarr.Api.V1.Queue
if (blocklist)
{
- _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipReDownload);
+ _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipRedownload);
}
if (!removeFromClient && !blocklist)
diff --git a/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs
index 2bed4caf8..d1b65d15c 100644
--- a/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.Download
{
ArtistId = 1,
AlbumIds = new List { 1 },
- SkipReDownload = true
+ SkipRedownload = true
};
Subject.Handle(failedEvent);
diff --git a/src/NzbDrone.Core/Download/DownloadFailedEvent.cs b/src/NzbDrone.Core/Download/DownloadFailedEvent.cs
index 40fadd628..dd4ad5751 100644
--- a/src/NzbDrone.Core/Download/DownloadFailedEvent.cs
+++ b/src/NzbDrone.Core/Download/DownloadFailedEvent.cs
@@ -21,6 +21,6 @@ namespace NzbDrone.Core.Download
public string Message { get; set; }
public Dictionary Data { get; set; }
public TrackedDownload TrackedDownload { get; set; }
- public bool SkipReDownload { get; set; }
+ public bool SkipRedownload { get; set; }
}
}
diff --git a/src/NzbDrone.Core/Download/FailedDownloadService.cs b/src/NzbDrone.Core/Download/FailedDownloadService.cs
index bf4c244d7..1ac4ec3f4 100644
--- a/src/NzbDrone.Core/Download/FailedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/FailedDownloadService.cs
@@ -9,8 +9,8 @@ namespace NzbDrone.Core.Download
{
public interface IFailedDownloadService
{
- void MarkAsFailed(int historyId, bool skipReDownload = false);
- void MarkAsFailed(string downloadId, bool skipReDownload = false);
+ void MarkAsFailed(int historyId, bool skipRedownload = false);
+ void MarkAsFailed(string downloadId, bool skipRedownload = false);
void Check(TrackedDownload trackedDownload);
void ProcessFailed(TrackedDownload trackedDownload);
}
@@ -30,14 +30,14 @@ namespace NzbDrone.Core.Download
_eventAggregator = eventAggregator;
}
- public void MarkAsFailed(int historyId, bool skipReDownload = false)
+ public void MarkAsFailed(int historyId, bool skipRedownload = false)
{
var history = _historyService.Get(historyId);
var downloadId = history.DownloadId;
if (downloadId.IsNullOrWhiteSpace())
{
- PublishDownloadFailedEvent(new List { history }, "Manually marked as failed", skipReDownload: skipReDownload);
+ PublishDownloadFailedEvent(new List { history }, "Manually marked as failed", skipRedownload: skipRedownload);
}
else
{
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Download
}
}
- public void MarkAsFailed(string downloadId, bool skipReDownload = false)
+ public void MarkAsFailed(string downloadId, bool skipRedownload = false)
{
var history = _historyService.Find(downloadId, EntityHistoryEventType.Grabbed);
@@ -54,7 +54,7 @@ namespace NzbDrone.Core.Download
{
var trackedDownload = _trackedDownloadService.Find(downloadId);
- PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipReDownload);
+ PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipRedownload);
}
}
@@ -114,7 +114,7 @@ namespace NzbDrone.Core.Download
PublishDownloadFailedEvent(grabbedItems, failure, trackedDownload);
}
- private void PublishDownloadFailedEvent(List historyItems, string message, TrackedDownload trackedDownload = null, bool skipReDownload = false)
+ private void PublishDownloadFailedEvent(List historyItems, string message, TrackedDownload trackedDownload = null, bool skipRedownload = false)
{
var historyItem = historyItems.First();
@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Download
Message = message,
Data = historyItem.Data,
TrackedDownload = trackedDownload,
- SkipReDownload = skipReDownload
+ SkipRedownload = skipRedownload
};
_eventAggregator.PublishEvent(downloadFailedEvent);
diff --git a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
index a091211f6..b920296ca 100644
--- a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Download
[EventHandleOrder(EventHandleOrder.Last)]
public void Handle(DownloadFailedEvent message)
{
- if (message.SkipReDownload)
+ if (message.SkipRedownload)
{
_logger.Debug("Skip redownloading requested by user");
return;
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 50616f533..2e01b3ea0 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -743,12 +743,14 @@
"RemoveFilter": "Remove filter",
"RemoveFromBlocklist": "Remove from blocklist",
"RemoveFromDownloadClient": "Remove From Download Client",
+ "RemoveFromDownloadClientHelpTextWarning": "Removing will remove the download and the file(s) from the download client.",
"RemoveFromQueue": "Remove from queue",
- "RemoveHelpTextWarning": "Removing will remove the download and the file(s) from the download client.",
"RemoveSelected": "Remove Selected",
"RemoveSelectedItem": "Remove Selected Item",
"RemoveSelectedItemBlocklistMessageText": "Are you sure you want to remove the selected items from the blocklist?",
+ "RemoveSelectedItemQueueMessageText": "Are you sure you want to remove 1 item from the queue?",
"RemoveSelectedItems": "Remove Selected Items",
+ "RemoveSelectedItemsQueueMessageText": "Are you sure you want to remove {0} items from the queue?",
"RemoveTagExistingTag": "Existing tag",
"RemoveTagRemovingTag": "Removing tag",
"RemovedFromTaskQueue": "Removed from task queue",
@@ -876,7 +878,7 @@
"SkipFreeSpaceCheck": "Skip Free Space Check",
"SkipFreeSpaceCheckWhenImportingHelpText": "Use when Lidarr is unable to detect free space from your artist root folder",
"SkipRedownload": "Skip Redownload",
- "SkipredownloadHelpText": "Prevents Lidarr from trying download alternative releases for the removed items",
+ "SkipRedownloadHelpText": "Prevents Lidarr from trying download alternative releases for the removed items",
"SmartReplace": "Smart Replace",
"SomeResultsFiltered": "Some results are hidden by the applied filter",
"SorryThatAlbumCannotBeFound": "Sorry, that album cannot be found.",