From 3bc2a64796dbc0581071fc4095a0013fa9be7a21 Mon Sep 17 00:00:00 2001
From: Paul Seal <prjseal@gmail.com>
Date: Thu, 14 Oct 2021 13:21:28 +0100
Subject: [PATCH 1/2] Added more detailed message when deleting items in the
 list view

---
 .../views/propertyeditors/listview/listview.controller.js   | 6 ++++--
 .../src/views/propertyeditors/listview/listview.html        | 2 +-
 .../src/views/propertyeditors/listview/overlays/delete.html | 2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml               | 1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml            | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
index 76e6759a475e..c66ff1a46171 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
@@ -380,7 +380,7 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
         });
     }
 
-    $scope.delete = function () {
+    $scope.delete = function (numberOfItems, totalItems) {
 
         const dialog = {
             view: "views/propertyeditors/listview/overlays/delete.html",
@@ -394,7 +394,9 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
             },
             close: function () {
                 overlayService.close();
-            }
+            },
+            numberOfItems: numberOfItems,
+            totalItems: totalItems
         };
 
         localizationService.localize("general_delete").then(value => {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 92ad56b045a7..7fad01fe6c2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -190,7 +190,7 @@
                        button-style="white"
                        label-key="actions_delete"
                        icon="icon-trash"
-                       action="delete()"
+                       action="delete(selection.length, listViewResultSet.items.length)"
                        disabled="actionInProgress"
                        size="xs"
                        add-ellipsis="true">
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html
index 1c99aa594e42..74b3cce7e52a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html
@@ -1,7 +1,7 @@
 <div>
 
     <p class="abstract">
-        <localize key="defaultdialogs_confirmdelete"></localize>?
+        <localize key="defaultdialogs_confirmdeleteNumberOfItems" tokens="[model.numberOfItems, model.totalItems]"></localize>?
     </p>
 
     <div class="umb-alert umb-alert--warning" ng-show="model.deletesVariants && !model.isTrashed">
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index dbb8a7a6b6ea..42a5da928f81 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -414,6 +414,7 @@
     <key alias="assignDomain">Manage hostnames</key>
     <key alias="closeThisWindow">Close this window</key>
     <key alias="confirmdelete">Are you sure you want to delete</key>
+    <key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></key>
     <key alias="confirmdisable">Are you sure you want to disable</key>
     <key alias="confirmremove">Are you sure you want to remove</key>
     <key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 06cc8de008d7..cc8a730f7ab5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -424,6 +424,7 @@
     <key alias="anchorInsert">Name</key>
     <key alias="closeThisWindow">Close this window</key>
     <key alias="confirmdelete">Are you sure you want to delete</key>
+    <key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></key>
     <key alias="confirmdisable">Are you sure you want to disable</key>
     <key alias="confirmremove">Are you sure you want to remove</key>
     <key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>

From bcafb02661f0114614a63c4feaf8fb87447b9dbf Mon Sep 17 00:00:00 2001
From: Michael <michael@crossingpaths.be>
Date: Sun, 17 Oct 2021 01:35:31 +0200
Subject: [PATCH 2/2] Update FR language file

---
 src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index d9fd74d81815..af7abd049a78 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -387,6 +387,7 @@
     <key alias="anchorInsert">Nom</key>
     <key alias="closeThisWindow">Fermer cette fenêtre</key>
     <key alias="confirmdelete">Êtes-vous certain(e) de vouloir supprimer</key>
+    <key alias="confirmdeleteNumberOfItems"><![CDATA[Êtes-vous certain(e) de vouloir supprimer <b>%0%</b> des <b>%1%</b> éléments]]></key>
     <key alias="confirmdisable">Êtes-vous certain(e) de vouloir désactiver</key>
     <key alias="confirmlogout">Êtes-vous certain(e)?</key>
     <key alias="confirmSure">Êtes-vous certain(e)?</key>