Merge "Separate parameters for the filter ID and localized filter name in AbuseFilter"

Views/AbuseFilterViewRevert.php

@@ -175,7 +175,11 @@ class AbuseFilterViewRevert extends AbuseFilterView {
 				$this->revertAction( $action, $result );
 			}
 		}
-		$this->getOutput()->addWikiMsg( 'abusefilter-revert-success', $filter );
+		$this->getOutput()->addWikiMsg(
+			'abusefilter-revert-success',
+			$filter,
+			$this->getLanguage()->formatNum( $filter )
+		);
 
 		return true;
 	}

i18n/en.json

@@ -166,7 +166,7 @@
     "abusefilter-edit-denied": "You may not view details of this filter, because it is hidden from public view.",
     "abusefilter-edit-main": "Filter parameters",
     "abusefilter-edit-done-subtitle": "Filter edited",
-    "abusefilter-edit-done": "[[Special:AbuseFilter/history/$1/diff/prev/$2|Your changes]] to [[Special:AbuseFilter/$1|filter $1]] have been saved.",
+    "abusefilter-edit-done": "[[Special:AbuseFilter/history/$1/diff/prev/$2|Your changes]] to [[Special:AbuseFilter/$1|filter $3]] have been saved.",
     "abusefilter-edit-badsyntax": "There is a syntax error in the filter you specified.\nThe output from the parser was: <pre>$1</pre>",
     "abusefilter-edit-restricted": "You cannot edit this filter, because it contains one or more restricted actions.\nPlease ask a user with permission to add restricted actions to make the change for you.",
     "abusefilter-edit-viewhistory": "View this filter's history",
@@ -335,7 +335,7 @@
     "abusefilter-revert-filter": "Filter:",
     "abusefilter-revert-preview-intro": "Below are the actions taken by the abuse filter that will be reverted by this action.\nPlease check them carefully, and click \"{{int:abusefilter-revert-confirm}}\" to confirm your selection.",
     "abusefilter-revert-confirm": "Confirm",
-    "abusefilter-revert-success": "You have reverted all actions taken by the abuse filter due to [[Special:AbuseFilter/$1|filter $1]].",
+    "abusefilter-revert-success": "You have reverted all actions taken by the abuse filter due to [[Special:AbuseFilter/$1|filter $2]].",
     "abusefilter-revert-reason": "Automatic revert of all actions taken by the abuse filter due to filter $1.\nReason given: $2",
     "abusefilter-revert-reasonfield": "Reason:",
     "abusefilter-test": "Test a filter against previous edits",

i18n/qqq.json

@@ -194,7 +194,7 @@
 	"abusefilter-edit-denied": "Text used when a user has to access to filter details.",
 	"abusefilter-edit-main": "Fieldset legend for edit filter form.",
 	"abusefilter-edit-done-subtitle": "Page subtitle when as filter was edited and saved.",
-	"abusefilter-edit-done": "Text displayed to a user after editing a filter. Parameters:\n* $1 - a filter ID\n* $2 - the ID of the change itself",
+	"abusefilter-edit-done": "Text displayed to a user after editing a filter. Parameters:\n* $1 - a filter ID\n* $2 - the ID of the change itself\n* $3 - localized filter ID",
 	"abusefilter-edit-badsyntax": "Message to warn a user that a filter could not be edited for a given reason. Parameters:\n* $1 is a parser error text.",
 	"abusefilter-edit-restricted": "Message to warn a user that a filter could not be edited for a given reason.",
 	"abusefilter-edit-viewhistory": "Link description for link that leads to a revision overview for a filter.",
@@ -334,7 +334,7 @@
 	"abusefilter-revert-filter": "{{Identical|Filter}}",
 	"abusefilter-revert-preview-intro": "Refers to {{msg-mw|Abusefilter-revert-confirm}}.",
 	"abusefilter-revert-confirm": "This is also used in {{msg-mw|Abusefilter-revert-preview-intro}}. When changing this message, please also remember to change that one.\n{{Identical|Confirm}}",
-	"abusefilter-revert-success": "Parameters:\n* $1 - filter",
+	"abusefilter-revert-success": "Parameters:\n* $1 - a filter ID\n* $2 - localized filter ID",
 	"abusefilter-revert-reason": "Parameters:\n* $1 is a filter ID\n* $2 is a reason",
 	"abusefilter-revert-reasonfield": "{{Identical|Reason}}",
 	"abusefilter-test-intro": "Used as intro text.\n\nThe page title is {{msg-mw|Abusefilter-test}}.\n\nRefers to {{msg-mw|Abusefilter-test-load}}.\n\nParameters:\n* $1 - limit of changes; 100 (hard-coded)",

special/SpecialAbuseFilter.php

@@ -38,8 +38,9 @@ class SpecialAbuseFilter extends SpecialPage {
 			$out->wrapWikiMsg( '<p class="success">$1</p>',
 				array(
 					'abusefilter-edit-done',
-					$this->getLanguage()->formatNum( $changedFilter ),
-					$changeId
+					$changedFilter,
+					$changeId,
+					$this->getLanguage()->formatNum( $changedFilter )
 				)
 			);
 		}