Merge branch 'fix-jest' of https://github.com/NovemLinguae/twinkle in…

…to fix-jest
NovemLinguae · May 21, 2023 · f12f49f · f12f49f
2 parents 674cf4b + 1e9315c
commit f12f49f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/modules/friendlywelcome.js b/modules/friendlywelcome.js
@@ -327,6 +327,11 @@ Twinkle.welcome.templates = {
 				description: 'welcome with additional information about images (policy and procedure)',
 				linkedArticle: true,
 				syntax: '{{subst:welcome-image|$USERNAME$|art=$ARTICLE$}}'
+			},
+			'welcome-copyright': {
+				description: 'for someone who has been adding copyright violations to articles',
+				linkedArticle: true,
+				syntax: '{{subst:welcome-copyright|$ARTICLE$|$USERNAME$}} ~~~~'
 			}
 		}
 	},

diff --git a/modules/twinkleblock.js b/modules/twinkleblock.js
@@ -1023,7 +1023,7 @@ Twinkle.block.blockPresetsInfo = {
 		forRegisteredOnly: true,
 		nocreate: true,
 		reason: '{{uw-botuhblock}} <!-- Username implies a bot, hard block -->',
-		summary: 'You have been indefinitely blocked from editing because your username is a blatant violation of the [[WP:U|username policy]].'
+		summary: 'You have been indefinitely blocked from editing because your username is a blatant violation of the [[WP:U|username policy]]'
 	},
 	'uw-causeblock': {
 		expiry: 'infinity',

diff --git a/modules/twinkleprotect.js b/modules/twinkleprotect.js
@@ -712,6 +712,7 @@ Twinkle.protect.protectionTypes = [
 	{
 		label: 'Extended confirmed protection',
 		list: [
+			{ label: 'Generic (ECP)', value: 'pp-30-500' },
 			{ label: 'Arbitration enforcement (ECP)', selected: true, value: 'pp-30-500-arb' },
 			{ label: 'Persistent vandalism (ECP)', value: 'pp-30-500-vandalism' },
 			{ label: 'Disruptive editing (ECP)', value: 'pp-30-500-disruptive' },
@@ -841,6 +842,12 @@ Twinkle.protect.protectionPresetsInfo = {
 		reason: 'Persistent [[WP:Sock puppetry|sock puppetry]]',
 		template: 'pp-extended'
 	},
+	'pp-30-500': {
+		edit: 'extendedconfirmed',
+		move: 'extendedconfirmed',
+		reason: null,
+		template: 'pp-extended'
+	},
 	'pp-semi-vandalism': {
 		edit: 'autoconfirmed',
 		reason: 'Persistent [[WP:Vandalism|vandalism]]',
@@ -1241,6 +1248,7 @@ Twinkle.protect.callback.evaluate = function twinkleprotectCallbackEvaluate(e) {
 				case 'pp-30-500-disruptive':
 				case 'pp-30-500-blp':
 				case 'pp-30-500-sock':
+				case 'pp-30-500':
 					typename = 'extended confirmed protection';
 					break;
 				case 'pp-semi-vandalism':

diff --git a/modules/twinklewarn.js b/modules/twinklewarn.js
@@ -355,6 +355,20 @@ Twinkle.warn.messages = {
 					summary: 'Final warning: Introducing deliberate factual errors'
 				}
 			},
+			'uw-fringe': {
+				level1: {
+					label: 'Introducing fringe theories',
+					summary: 'General note: Introducing fringe theories'
+				},
+				level2: {
+					label: 'Introducing fringe theories',
+					summary: 'Caution: Introducing fringe theories'
+				},
+				level3: {
+					label: 'Introducing fringe theories',
+					summary: 'Warning: Introducing fringe theories'
+				}
+			},
 			'uw-genre': {
 				level1: {
 					label: 'Frequent or mass changes to genres without consensus or references',
@@ -1104,7 +1118,7 @@ Twinkle.warn.messages = {
 		},
 		'uw-wrongsummary': {
 			label: 'Using inaccurate or inappropriate edit summaries',
-			summary: 'Warning: Using inaccurate or inappropriate edit summaries'
+			summary: 'Notice: Using inaccurate or inappropriate edit summaries'
 		}
 	},