Siebrand has submitted this change and it was merged.
Change subject: Adding trailing dot + comment for grep (24 messages)
......................................................................
Adding trailing dot + comment for grep (24 messages)
Change-Id: I7b532028a2bdbed11f0dfe6cdf4eb4514671294c
---
M AbuseFilter.i18n.php
M AbuseFilter.parser.php
M Views/AbuseFilterViewEdit.php
3 files changed, 16 insertions(+), 1 deletion(-)
Approvals:
Siebrand: Verified; Looks good to me, approved
diff --git a/AbuseFilter.i18n.php b/AbuseFilter.i18n.php
index 959a78b..595373e 100644
--- a/AbuseFilter.i18n.php
+++ b/AbuseFilter.i18n.php
@@ -381,7 +381,7 @@
'abusefilter-exception-unrecognisedtoken' => 'Unrecognized token "$2"
at character $1.',
'abusefilter-exception-noparams' => 'No parameters given to function
"$2" at character $1.',
'abusefilter-exception-dividebyzero' => 'Illegal attempt to divide $2
by zero at character $1.',
- 'abusefilter-exception-unrecognisedvar' => 'Unrecognized variable $2 at
character $1',
+ 'abusefilter-exception-unrecognisedvar' => 'Unrecognized variable $2 at
character $1.',
'abusefilter-exception-notenoughargs' => 'Not enough arguments to
function $2 called at character $1.
Expected $3 {{PLURAL:$3|argument|arguments}}, got $4',
'abusefilter-exception-regexfailure' => 'Error in regular expression
"$3" at character $1: "$2"',
diff --git a/AbuseFilter.parser.php b/AbuseFilter.parser.php
index f38f168..fa38d5d 100644
--- a/AbuseFilter.parser.php
+++ b/AbuseFilter.parser.php
@@ -519,6 +519,15 @@
* @param array $params
*/
function __construct( $exception_id, $position, $params ) {
+ // Give grep a chance to find the usages:
+ // abusefilter-exception-unexpectedatend,
abusefilter-exception-expectednotfound
+ // abusefilter-exception-unrecognisedkeyword,
abusefilter-exception-unexpectedtoken
+ // abusefilter-exception-unclosedstring,
abusefilter-exception-invalidoperator
+ // abusefilter-exception-unrecognisedtoken,
abusefilter-exception-noparams
+ // abusefilter-exception-dividebyzero,
abusefilter-exception-unrecognisedvar
+ // abusefilter-exception-notenoughargs,
abusefilter-exception-regexfailure
+ // abusefilter-exception-overridebuiltin,
abusefilter-exception-outofbounds
+ // abusefilter-exception-notlist
$msg = wfMessage(
'abusefilter-exception-' . $exception_id,
array_merge( array( $position ), $params )
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 41c0ab1..7aab7bd 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -720,6 +720,12 @@
);
return $output;
default:
+ // Give grep a chance to find the usages:
+ // abusefilter-edit-action-warn,
abusefilter-edit-action-disallow
+ // abusefilter-edit-action-flag,
abusefilter-edit-action-blockautopromote
+ // abusefilter-edit-action-degroup,
abusefilter-edit-action-block
+ // abusefilter-edit-action-throttle,
abusefilter-edit-action-rangeblock
+ // abusefilter-edit-action-tag
$message = 'abusefilter-edit-action-' . $action;
$form_field = 'wpFilterAction' . ucfirst(
$action );
$status = $set;
--
To view, visit https://gerrit.wikimedia.org/r/52558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b532028a2bdbed11f0dfe6cdf4eb4514671294c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Shirayuki <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Shirayuki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
