www

commit 3672d2a895862329a677ff7e7ac230999d1174fc
parent d5f3e6d8f74b4c9ea2e3af84fcb4369c70ce1e39
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon,  9 Mar 2015 22:27:12 -0400

Merge pull request #668 from rmzelle/confirm-remove-from-collection

Add prompt for Remove Item(s) from Collection
Diffstat:
M
chrome/content/zotero/zoteroPane.js
 | 
8
+++++++-
M
chrome/locale/en-US/zotero/zotero.properties
 | 
7
+++++--

2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -1597,6 +1597,12 @@ var ZoteroPane = new function()
 				'pane.items.delete' + (this.itemsView.selection.count > 1 ? '.multiple' : '')
 			)
 		};
+		var toRemove = {
+			title: Zotero.getString('pane.items.remove.title'),
+			text: Zotero.getString(
+				'pane.items.remove' + (this.itemsView.selection.count > 1 ? '.multiple' : '')
+			)
+		};
 		
 		if (itemGroup.isLibrary(true)) {
 			// In library, don't prompt if meta key was pressed
@@ -1604,7 +1610,7 @@ var ZoteroPane = new function()
 		}
 		else if (itemGroup.isCollection()) {
 			// In collection, only prompt if trashing
-			var prompt = force ? toTrash : false;
+			var prompt = force ? toTrash : toRemove;
 		}
 		else if (itemGroup.isSearch() || itemGroup.isUnfiled() || itemGroup.isDuplicates()) {
 			if (!force) {
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
@@ -204,8 +204,11 @@ pane.items.trash.multiple		= Are you sure you want to move the selected items to
 pane.items.delete.title			= Delete
 pane.items.delete				= Are you sure you want to delete the selected item?
 pane.items.delete.multiple		= Are you sure you want to delete the selected items?
-pane.items.menu.remove                    = Remove Item from Collection
-pane.items.menu.remove.multiple           = Remove Items from Collection
+pane.items.remove.title			= Remove from Collection
+pane.items.remove				= Are you sure you want to remove the selected item from this collection?
+pane.items.remove.multiple		= Are you sure you want to remove the selected items from this collection?
+pane.items.menu.remove                    = Remove Item from Collection…
+pane.items.menu.remove.multiple           = Remove Items from Collection…
 pane.items.menu.moveToTrash               = Move Item to Trash…
 pane.items.menu.moveToTrash.multiple      = Move Items to Trash…
 pane.items.menu.export                    = Export Item…