From 0ad2cd1285a1cd86643cf1b40379254fc4bff11c Mon Sep 17 00:00:00 2001
From: Dominik Bruhn <dominik@dbruhn.de>
Date: Sat, 8 Jun 2024 08:26:37 +0200
Subject: [PATCH] Apply suggestions from code review for better texts

Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
---
 src-ui/messages.xlf                                         | 6 +++---
 .../merge-confirm-dialog.component.html                     | 6 ++----
 src/documents/bulk_edit.py                                  | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 1055e353f..98f2bc8e2 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -2971,17 +2971,17 @@
         </context-group>
       </trans-unit>
       <trans-unit id="2519605321077387027" datatype="html">
-        <source> Delete original documents after merge </source>
+        <source> Delete original documents after successful merge </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html</context>
-          <context context-type="linenumber">32,34</context>
+          <context context-type="linenumber">32</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5138283234724909648" datatype="html">
         <source>Note that only PDFs will be included.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8157388568390631653" datatype="html">
diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
index 7dd6bccc9..576861ff2 100644
--- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
@@ -28,10 +28,8 @@
         </select>
     </div>
     <div class="form-check form-switch mt-4">
-      <input class="form-check-input" type="checkbox" value="" id="deleteOriginals" [(ngModel)]="deleteOriginals" [disabled]="!userOwnsAllDocuments">
-      <label class="form-check-label" for="deleteOrginals" i18n>
-        Delete original documents after merge
-      </label>
+      <input class="form-check-input" type="checkbox" role="switch" id="deleteOriginalsSwitch" [(ngModel)]="deleteOriginals" [disabled]="!userOwnsAllDocuments">
+      <label class="form-check-label" for="deleteOriginalsSwitch" i18n>Delete original documents after successful merge</label>
     </div>
     <p class="small text-muted fst-italic mt-4" i18n>Note that only PDFs will be included.</p>
 </div>
diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index 9db319b80..ba5781775 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -293,7 +293,7 @@ def merge(
     )
 
     if delete_originals:
-        logger.info("Removing original documents after consumption of merged document")
+        logger.info("Queueing removal of original documents after consumption of merged document")
         chain(consume_task, delete_documents.si(affected_docs)).delay()
     else:
         consume_task.delay()