image, speedy, xfd: remove {{move to Commons}} when tagging files for…

… deletion Per request on [[WT:TW]]. Similar to what we do with {{new unreviewed article}}.
wikimedia-gadgets · Dec 30, 2011 · c6589e7 · c6589e7
1 parent e5de0db
commit c6589e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/modules/twinkleimage.js b/modules/twinkleimage.js
@@ -270,6 +270,9 @@ Twinkle.image.callbacks = {
 		var text = pageobj.getPageText();
 		var params = pageobj.getCallbackParameters();
 
+		// remove "move to Commons" tag - deletion-tagged files cannot be moved to Commons
+		text = text.replace(/\{\{(mtc|(copy |move )?to ?commons|move to wikimedia commons|copy to wikimedia commons)[^}]*}}/gi, "");
+
 		var tag = "{{di-" + params.type + "|date={{subst:#time:j F Y}}";
 		switch( params.type ) {
 			case 'no source no license':

diff --git a/modules/twinklespeedy.js b/modules/twinklespeedy.js
@@ -1032,6 +1032,10 @@ Twinkle.speedy.callbacks = {
 
 			// Remove tags that become superfluous with this action
 			text = text.replace(/\{\{\s*(New unreviewed article|Userspace draft)\s*(\|(?:\{\{[^{}]*\}\}|[^{}])*)?\}\}\s*/ig, "");
+			if (mw.config.get('wgNamespaceNumber') === 6) {
+				// remove "move to Commons" tag - deletion-tagged files cannot be moved to Commons
+				text = text.replace(/\{\{(mtc|(copy |move )?to ?commons|move to wikimedia commons|copy to wikimedia commons)[^}]*}}/gi, "");
+			}
 
 			// Generate edit summary for edit
 			var editsummary;

diff --git a/modules/twinklexfd.js b/modules/twinklexfd.js
@@ -913,6 +913,8 @@ Twinkle.xfd.callbacks = {
 			var text = pageobj.getPageText();
 			var params = pageobj.getCallbackParameters();
 
+			text = text.replace(/\{\{(mtc|(copy |move )?to ?commons|move to wikimedia commons|copy to wikimedia commons)[^}]*}}/gi, "");
+
 			pageobj.setPageText("{{ffd|log=" + params.date + "}}\n" + text);
 			pageobj.setEditSummary("Nominated for deletion at [[" + params.logpage + "#" + mw.config.get('wgPageName') + "]]." + Twinkle.getPref('summaryAd'));
 			switch (Twinkle.getPref('xfdWatchPage')) {
@@ -963,6 +965,8 @@ Twinkle.xfd.callbacks = {
 			var text = pageobj.getPageText();
 			var params = pageobj.getCallbackParameters();
 
+			text = text.replace(/\{\{(mtc|(copy |move )?to ?commons|move to wikimedia commons|copy to wikimedia commons)[^}]*}}/gi, "");
+
 			pageobj.setPageText("{{puf|help=off|log=" + params.date + "}}\n" + text);
 			pageobj.setEditSummary("Listed at [[WP:PUF|possibly unfree files]]: [[" + params.logpage + "#" + mw.config.get('wgPageName') + "]]." + Twinkle.getPref('summaryAd'));
 			switch (Twinkle.getPref('xfdWatchPage')) {
@@ -1152,7 +1156,7 @@ Twinkle.xfd.callbacks = {
 			var params = pageobj.getCallbackParameters();
 
 			pageobj.setPageText("{{subst:cfr-speedy|1=" + params.target + "}}\n" + text);
-			pageobj.setEditSummary("Nominated for speedy renaming; see [[WP:CFDS|categories for discussion/Speedy]]." + Twinkle.getPref('summaryAd'));
+			pageobj.setEditSummary("Nominated for speedy renaming; see [[WP:CFDS|Categories for discussion/Speedy]]." + Twinkle.getPref('summaryAd'));
 			switch (Twinkle.getPref('xfdWatchPage')) {
 				case 'yes':
 					pageobj.setWatchlist(true);