speedy: replace db-templatecat with C4 (wikimedia-gadgets#1994) (wiki…

…media-gadgets#2004)

This commit also removes "G8: Redirects to non-existent targets" from
the category-specific list, as it will never display on a redirect page
(the redirect-specific categories, which contain G8, will display
instead).

modules/twinkleconfig.js

@@ -38,7 +38,7 @@ Twinkle.config.commonSets = {
 		a1: 'A1', a2: 'A2', a3: 'A3', a7: 'A7', a9: 'A9', a10: 'A10', a11: 'A11',
 		u1: 'U1', u2: 'U2', u5: 'U5',
 		f1: 'F1', f2: 'F2', f3: 'F3', f7: 'F7', f8: 'F8', f9: 'F9',
-		c1: 'C1',
+		c1: 'C1', c4: 'C4',
 		r2: 'R2', r3: 'R3', r4: 'R4'
 	},
 	csdCriteriaDisplayOrder: [
@@ -47,7 +47,7 @@ Twinkle.config.commonSets = {
 		'a1', 'a2', 'a3', 'a7', 'a9', 'a10', 'a11',
 		'u1', 'u2', 'u5',
 		'f1', 'f2', 'f3', 'f7', 'f8', 'f9',
-		'c1',
+		'c1', 'c4',
 		'r2', 'r3', 'r4'
 	],
 	csdCriteriaNotification: {
@@ -75,7 +75,7 @@ Twinkle.config.commonSets = {
 		a1: 'A1', a2: 'A2', a3: 'A3', a7: 'A7', a9: 'A9', a10: 'A10', a11: 'A11',
 		u1: 'U1', u2: 'U2', u5: 'U5',
 		f1: 'F1', f2: 'F2', f3: 'F3', f4: 'F4', f5: 'F5', f6: 'F6', f7: 'F7', f8: 'F8', f9: 'F9', f11: 'F11',
-		c1: 'C1',
+		c1: 'C1', c4: 'C4',
 		r2: 'R2', r3: 'R3', r4: 'R4'
 	},
 	csdAndImageDeletionCriteriaDisplayOrder: [
@@ -84,7 +84,7 @@ Twinkle.config.commonSets = {
 		'a1', 'a2', 'a3', 'a7', 'a9', 'a10', 'a11',
 		'u1', 'u2', 'u5',
 		'f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f11',
-		'c1',
+		'c1', 'c4',
 		'r2', 'r3', 'r4'
 	],
 	namespacesNoSpecial: {

modules/twinklespeedy.js

@@ -700,21 +700,15 @@ Twinkle.speedy.categoryList = [
 		tooltip: 'Categories that have been unpopulated for at least seven days. This does not apply to categories being discussed at WP:CFD, disambiguation categories, and certain other exceptions. If the category isn\'t relatively new, it possibly contained articles earlier, and deeper investigation is needed'
 	},
 	{
-		label: 'G8: Categories populated by a deleted or retargeted template',
-		value: 'templatecat',
-		tooltip: 'This is for situations where a category is effectively empty, because the template(s) that formerly placed pages in that category are now deleted. This excludes categories that are still in use.',
+		label: 'C4: Permanently unused maintenance categories',
+		value: 'c4',
+		tooltip: 'Unused maintenance categories, such as empty dated maintenance categories for dates in the past, tracking categories no longer used by a template after a rewrite, or empty subcategories of Category:Wikipedia sockpuppets or Category:Suspected Wikipedia sockpuppets. Empty maintenance categories are not necessarily unused—this criterion is for categories which will always be empty, not just currently empty.',
 		subgroup: {
-			name: 'templatecat_rationale',
+			name: 'c4_rationale',
 			type: 'input',
 			label: 'Optional explanation:',
 			size: 60
 		}
-	},
-	{
-		label: 'G8: Redirects to non-existent targets',
-		value: 'redirnone',
-		tooltip: 'This excludes any page that is useful to the project, and in particular: deletion discussions that are not logged elsewhere, user and user talk pages, talk page archives, plausible redirects that can be changed to valid targets, and file pages or talk pages for files that exist on Wikimedia Commons.',
-		hideWhenMultiple: true
 	}
 ];
 
@@ -1019,7 +1013,6 @@ Twinkle.speedy.normalizeHash = {
 	'talk': 'g8',
 	'subpage': 'g8',
 	'redirnone': 'g8',
-	'templatecat': 'g8',
 	'imagepage': 'g8',
 	'attack': 'g10',
 	'negublp': 'g10',
@@ -1058,6 +1051,7 @@ Twinkle.speedy.normalizeHash = {
 	'imgcopyvio': 'f9',
 	'nopermission': 'f11',
 	'catempty': 'c1',
+	'c4': 'c4',
 	'userreq': 'u1',
 	'nouser': 'u2',
 	'notwebhost': 'u5'
@@ -1718,12 +1712,6 @@ Twinkle.speedy.getParameters = function twinklespeedyGetParameters(form, values)
 				}
 				break;
 
-			case 'templatecat':  // G8
-				if (form['csd.templatecat_rationale'] && form['csd.templatecat_rationale'].value) {
-					currentParams.rationale = form['csd.templatecat_rationale'].value;
-				}
-				break;
-
 			case 'attack':  // G10
 				currentParams.blanked = 'yes';
 				// it is actually blanked elsewhere in code, but setting the flag here
@@ -1814,6 +1802,12 @@ Twinkle.speedy.getParameters = function twinklespeedyGetParameters(form, values)
 				}
 				break;
 
+			case 'c4':  // C4
+				if (form['csd.c4_rationale'] && form['csd.c4_rationale'].value) {
+					currentParams.rationale = form['csd.c4_rationale'].value;
+				}
+				break;
+
 			default:
 				break;
 		}