Skip to content

Commit 9a6a7ff

Browse files
prjsealnul800sebastiaan
authored andcommitted
Added more detailed message when deleting items in the list view (#11375)
* Added more detailed message when deleting items in the list view * Update FR language file (cherry picked from commit 14fe7d9) # Conflicts: # src/Umbraco.Web.UI/Umbraco/config/lang/en.xml # src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
1 parent c7b2857 commit 9a6a7ff

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
380380
});
381381
}
382382

383-
$scope.delete = function () {
383+
$scope.delete = function (numberOfItems, totalItems) {
384384

385385
const dialog = {
386386
view: "views/propertyeditors/listview/overlays/delete.html",
@@ -394,7 +394,9 @@ function listViewController($scope, $interpolate, $routeParams, $injector, $time
394394
},
395395
close: function () {
396396
overlayService.close();
397-
}
397+
},
398+
numberOfItems: numberOfItems,
399+
totalItems: totalItems
398400
};
399401

400402
localizationService.localize("general_delete").then(value => {

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
button-style="white"
191191
label-key="actions_delete"
192192
icon="icon-trash"
193-
action="delete()"
193+
action="delete(selection.length, listViewResultSet.items.length)"
194194
disabled="actionInProgress"
195195
size="xs"
196196
add-ellipsis="true">

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/overlays/delete.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div>
22

33
<p class="abstract">
4-
<localize key="defaultdialogs_confirmdelete"></localize>?
4+
<localize key="defaultdialogs_confirmdeleteNumberOfItems" tokens="[model.numberOfItems, model.totalItems]"></localize>?
55
</p>
66

77
<div class="umb-alert umb-alert--warning" ng-show="model.deletesVariants && !model.isTrashed">

src/Umbraco.Web.UI/Umbraco/config/lang/en.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@
437437
<key alias="assignDomain">Manage hostnames</key>
438438
<key alias="closeThisWindow">Close this window</key>
439439
<key alias="confirmdelete">Are you sure you want to delete</key>
440-
<key alias="confirmdeleteXofX">Are you sure you want to delete %0% based on %1%</key>
440+
<key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></key>
441441
<key alias="confirmdisable">Are you sure you want to disable</key>
442442
<key alias="confirmremove">Are you sure you want to remove</key>
443443
<key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>

src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@
443443
<key alias="anchorInsert">Name</key>
444444
<key alias="closeThisWindow">Close this window</key>
445445
<key alias="confirmdelete">Are you sure you want to delete</key>
446+
<key alias="confirmdeleteNumberOfItems"><![CDATA[Are you sure you want to delete <b>%0%</b> of <b>%1%</b> items]]></key>
446447
<key alias="confirmdisable">Are you sure you want to disable</key>
447448
<key alias="confirmremove">Are you sure you want to remove</key>
448449
<key alias="confirmremoveusageof"><![CDATA[Are you sure you want to remove the usage of <b>%0%</b>]]></key>

src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@
403403
<key alias="anchorInsert">Nom</key>
404404
<key alias="closeThisWindow">Fermer cette fenêtre</key>
405405
<key alias="confirmdelete">Êtes-vous certain(e) de vouloir supprimer</key>
406+
<key alias="confirmdeleteNumberOfItems"><![CDATA[Êtes-vous certain(e) de vouloir supprimer <b>%0%</b> des <b>%1%</b> éléments]]></key>
406407
<key alias="confirmdisable">Êtes-vous certain(e) de vouloir désactiver</key>
407408
<key alias="confirmlogout">Êtes-vous certain(e)?</key>
408409
<key alias="confirmSure">Êtes-vous certain(e)?</key>

0 commit comments

Comments
 (0)