IoannisKydonis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265467
Change subject: Add link to abusefilter-edit-lastmod-text
......................................................................
Add link to abusefilter-edit-lastmod-text
This adds a link to the diff of the edited filter.
Bug: T53382
Change-Id: I57104f592fc3961bb43ecea8442ef6666ed4a69c
---
M Views/AbuseFilterViewEdit.php
M Views/AbuseFilterViewList.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter
refs/changes/67/265467/1
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 2a2f742..233fc95 100755
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -479,6 +479,8 @@
Linker::userLink( $row->af_user,
$row->af_user_text ) .
Linker::userToolLinks( $row->af_user,
$row->af_user_text );
$userName = $row->af_user_text;
+ $changedFilter = intval( $request->getVal(
'changedfilter' ) );
+ $changeId = intval( $request->getVal( 'changeid' ) );
$fields['abusefilter-edit-lastmod'] =
$this->msg( 'abusefilter-edit-lastmod-text' )
->rawParams(
@@ -486,7 +488,9 @@
$userLink,
$lang->date( $row->af_timestamp, true ),
$lang->time( $row->af_timestamp, true ),
- $userName
+ $userName,
+ $this->getLanguage()->formatNum(
$changedFilter ),
+ $changeId
)->parse();
$history_display = $this->msg(
'abusefilter-edit-viewhistory' )->parse();
$fields['abusefilter-edit-history'] =
diff --git a/Views/AbuseFilterViewList.php b/Views/AbuseFilterViewList.php
index c549d9c..0e18086 100644
--- a/Views/AbuseFilterViewList.php
+++ b/Views/AbuseFilterViewList.php
@@ -318,12 +318,16 @@
$row->af_user_text
);
$user = $row->af_user_text;
+ $changedFilter = intval( $request->getVal(
'changedfilter' ) );
+ $changeId = intval( $request->getVal(
'changeid' ) );
return $this->msg(
'abusefilter-edit-lastmod-text' )
->rawParams( $lang->timeanddate(
$value, true ),
$userLink,
$lang->date( $value, true ),
$lang->time( $value, true ),
- $user
+ $user,
+
$this->getLanguage()->formatNum( $changedFilter ),
+ $changeId
)->parse();
case 'af_group':
return AbuseFilter::nameGroup( $value );
@@ -411,13 +415,17 @@
return $this->msg( 'abusefilter-hitcount'
)->numParams( $value )->parse();
case 'af_timestamp':
$user = $row->af_user_text;
+ $changedFilter = intval( $request->getVal(
'changedfilter' ) );
+ $changeId = intval( $request->getVal(
'changeid' ) );
return $this->msg(
'abusefilter-edit-lastmod-text',
$lang->timeanddate( $value, true ),
$user,
$lang->date( $value, true ),
$lang->time( $value, true ),
- $user
+ $user,
+ $this->getLanguage()->formatNum(
$changedFilter ),
+ $changeId
)->parse();
case 'af_group':
// If this is global, local name probably
doesn't exist, but try
diff --git a/i18n/en.json b/i18n/en.json
index f10ddde..28ff951 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -142,7 +142,7 @@
"abusefilter-edit-rules": "Conditions:",
"abusefilter-edit-notes": "Notes:",
"abusefilter-edit-lastmod": "Filter last modified:",
- "abusefilter-edit-lastmod-text": "$1 by $2",
+ "abusefilter-edit-lastmod-text":
"[[Special:AbuseFilter/history/$6/diff/prev/$7|$1]] by $2",
"abusefilter-edit-hitcount": "Filter hits:",
"abusefilter-edit-consequences": "Actions taken when matched",
"abusefilter-edit-action-warn": "Trigger these actions after giving the
user a warning",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 233014b..0185d12 100755
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -172,7 +172,7 @@
"abusefilter-edit-rules": "Field label for filter
rules.\n{{Identical|Condition}}",
"abusefilter-edit-notes": "Field label for filter
notes.\n{{Identical|Note}}",
"abusefilter-edit-lastmod": "Field label for filter's last modified
timestamp.",
- "abusefilter-edit-lastmod-text": "This message is used on
[[Special:AbuseFilter]] to indicate the last modified date, time and user for
existing rules.\n\nParameters:\n* $1 - a time and date (duplicated in $3 and
$4)\n* $2 - a link to a user page with a user name as link text, followed by a
series of related links\n* $3 - (Optional) the date\n* $4 - (Optional) the
time\n* $5 - (Optional) the username, for GENDER support",
+ "abusefilter-edit-lastmod-text": "This message is used on
[[Special:AbuseFilter]] to indicate the last modified date, time and user for
existing rules.\n\nParameters:\n* $1 - a time and date (duplicated in $3 and
$4)\n* $2 - a link to a user page with a user name as link text, followed by a
series of related links\n* $3 - (Optional) the date\n* $4 - (Optional) the
time\n* $5 - (Optional) the username, for GENDER support\n* $6 - a filter ID\n*
$7 - the ID of the change itself",
"abusefilter-edit-hitcount": "Field label in edit rule form after which
the number of filter hits is displayed.",
"abusefilter-edit-consequences": "Table header in filter version
differences.",
"abusefilter-edit-action-warn": "{{doc-abusefilter-action}}",
--
To view, visit https://gerrit.wikimedia.org/r/265467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57104f592fc3961bb43ecea8442ef6666ed4a69c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
