[MediaWiki-commits] [Gerrit] Support GENDER in two more log messages - change (mediawiki...AbuseFilter)
jenkins-bot has submitted this change and it was merged.
Change subject: Support GENDER in two more log messages
..
Support GENDER in two more log messages
Change-Id: I92085a291565bd76e3f983da3bb4dfdb253b8007
---
M i18n/en.json
M i18n/qqq.json
M special/SpecialAbuseLog.php
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index fb3421a..73ca257 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,8 +47,8 @@
"abusefilter-log-search-title": "Title:",
"abusefilter-log-search-wiki": "Wiki:",
"abusefilter-log-search-submit": "Search",
- "abusefilter-log-entry": "$1: $2 triggered an abuse filter, performing
the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6",
- "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter,
performing the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6
($7)",
+ "abusefilter-log-entry": "$1: $2 triggered an abuse filter,
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter
description: $6",
+ "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter,
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter
description: $6 ($7)",
"abusefilter-log-detailedentry-meta": "$1: $2 triggered $3,
{{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter
description: $7 ($8)",
"abusefilter-log-detailedentry-global": "global filter $1",
"abusefilter-log-detailedentry-local": "filter $1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dab9ee9..c6f5df2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -78,8 +78,8 @@
"abusefilter-log-search-title": "Field label in abuse filter log
page.\n{{Identical|Title}}",
"abusefilter-log-search-wiki": "Label for text field that allows the
user to limit search results to a specific wiki, by name.\n{{Identical|Wiki}}",
"abusefilter-log-search-submit": "Button text to search log in abuse
filter log page.\n{{Identical|Search}}",
- "abusefilter-log-entry": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter
description\n{{Related|Abusefilter-log}}",
- "abusefilter-log-entry-withdiff": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter description\n* $7 - link to
diff\n{{Related|Abusefilter-log}}",
+ "abusefilter-log-entry": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter description\n* $8 - raw username, for
GENDER support\n{{Related|Abusefilter-log}}",
+ "abusefilter-log-entry-withdiff": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter description\n* $7 - link to diff\n* $8
- raw username, for GENDER support\n{{Related|Abusefilter-log}}",
"abusefilter-log-detailedentry-meta": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - link to filter\n* $4 -
action by user\n* $5 - link to page the action that triggered the filter was
made on\n* $6 - actions taken by the filter\n* $7 - comments in filter
description\n* $8 - link to action details, examine, and optional diff\n* $9 -
(Optional) raw username, for GENDER support\n{{Related|Abusefilter-log}}",
"abusefilter-log-detailedentry-global": "Addition in the abuse filter
log detail when a filter rule is a global rule. Parameters:\n* $1 is a global
filter ID.",
"abusefilter-log-detailedentry-local": "Addition in the abuse filter
log detail when a filter rule is a local rule. Parameters:\n* $1 is a local
filter ID.\n{{Identical|Filter}}",
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index a97d0a0..be70819 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -586,7 +586,7 @@
$actions_taken,
$parsed_comments,
$diffLink // Passing $7 to
'abusefilter-log-entry' will do nothing, as it's not used.
- )->parse();
+ )->params( $row->afl_user_text )->parse();
}
if (
[MediaWiki-commits] [Gerrit] Support GENDER in two more log messages - change (mediawiki...AbuseFilter)
Matěj Suchánek has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292782
Change subject: Support GENDER in two more log messages
..
Support GENDER in two more log messages
Change-Id: I92085a291565bd76e3f983da3bb4dfdb253b8007
---
M i18n/en.json
M i18n/qqq.json
M special/SpecialAbuseLog.php
3 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/82/292782/1
diff --git a/i18n/en.json b/i18n/en.json
index fb3421a..73ca257 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,8 +47,8 @@
"abusefilter-log-search-title": "Title:",
"abusefilter-log-search-wiki": "Wiki:",
"abusefilter-log-search-submit": "Search",
- "abusefilter-log-entry": "$1: $2 triggered an abuse filter, performing
the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6",
- "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter,
performing the action \"$3\" on $4.\nActions taken: $5;\nFilter description: $6
($7)",
+ "abusefilter-log-entry": "$1: $2 triggered an abuse filter,
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter
description: $6",
+ "abusefilter-log-entry-withdiff": "$1: $2 triggered an abuse filter,
{{GENDER:$8|performing}} the action \"$3\" on $4.\nActions taken: $5;\nFilter
description: $6 ($7)",
"abusefilter-log-detailedentry-meta": "$1: $2 triggered $3,
{{GENDER:$9|performing}} the action \"$4\" on $5.\nActions taken: $6;\nFilter
description: $7 ($8)",
"abusefilter-log-detailedentry-global": "global filter $1",
"abusefilter-log-detailedentry-local": "filter $1",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dab9ee9..c6f5df2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -78,8 +78,8 @@
"abusefilter-log-search-title": "Field label in abuse filter log
page.\n{{Identical|Title}}",
"abusefilter-log-search-wiki": "Label for text field that allows the
user to limit search results to a specific wiki, by name.\n{{Identical|Wiki}}",
"abusefilter-log-search-submit": "Button text to search log in abuse
filter log page.\n{{Identical|Search}}",
- "abusefilter-log-entry": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter
description\n{{Related|Abusefilter-log}}",
- "abusefilter-log-entry-withdiff": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter description\n* $7 - link to
diff\n{{Related|Abusefilter-log}}",
+ "abusefilter-log-entry": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter description\n* $8 - raw username, for
GENDER support\n{{Related|Abusefilter-log}}",
+ "abusefilter-log-entry-withdiff": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - action by user\n* $4 - link
to page the action that triggered the filter was made on\n* $5 - actions taken
by the filter\n* $6 - comments in filter description\n* $7 - link to diff\n* $8
- raw username, for GENDER support\n{{Related|Abusefilter-log}}",
"abusefilter-log-detailedentry-meta": "This message is for a log entry.
Parameters:\n* $1 - timestamp\n* $2 - user\n* $3 - link to filter\n* $4 -
action by user\n* $5 - link to page the action that triggered the filter was
made on\n* $6 - actions taken by the filter\n* $7 - comments in filter
description\n* $8 - link to action details, examine, and optional diff\n* $9 -
(Optional) raw username, for GENDER support\n{{Related|Abusefilter-log}}",
"abusefilter-log-detailedentry-global": "Addition in the abuse filter
log detail when a filter rule is a global rule. Parameters:\n* $1 is a global
filter ID.",
"abusefilter-log-detailedentry-local": "Addition in the abuse filter
log detail when a filter rule is a local rule. Parameters:\n* $1 is a local
filter ID.\n{{Identical|Filter}}",
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index a97d0a0..be70819 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -586,7 +586,7 @@
$actions_taken,
$parsed_comments,
$diffLink // Passing $7 to
'abusefilter-log-entry' will do nothing, as it's not used.
- )->parse();
+ )->params( $row->afl_user_text
