jenkins-bot has submitted this change and it was merged.
Change subject: bug T46798: Don't abuse comma-separator message
......................................................................
bug T46798: Don't abuse comma-separator message
Rename all checkuser-log-* messages related
to Special:CheckUserLog entry types to
"checkuser-log-entry-*" to clearly
identify i18n messages used for various checkuser
events. Also the format of those is changed
as described below:
This change to CheckUser.i18n.php is done
automatically using the following sed(1) script:
s/checkuser-log-userips/checkuser-log-entry-userips/g
s/checkuser-log-ipedits/checkuser-log-entry-ipedits/g
s/checkuser-log-ipusers/checkuser-log-entry-ipusers/g
s/checkuser-log-ipedits-xff/checkuser-log-entry-ipedits-xff/g
s/checkuser-log-ipusers-xff/checkuser-log-entry-ipusers-xff/g
s/checkuser-log-useredits/checkuser-log-entry-useredits/g
Timestamp in checkuser-log-entry-* is now included
in the messages as "$3". Update all messages accordingly,
using previously used separator ("comma-separator"), with
  replaced with a literal space. Some messages are
manually tweaked as well.
Also remove redundant check for an empty comment.
The comment cannot be included as $4 as it already
contains pre-formatted HTML.
https://bugzilla.wikimedia.org/show_bug.cgi?id=44798
Bug: T46798
Change-Id: Ife21fd09aa6d0c74241dbd7b9130b10292f306ac
---
M CheckUserLogPager.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 19 insertions(+), 25 deletions(-)
Approvals:
Reedy: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CheckUserLogPager.php b/CheckUserLogPager.php
index c2e02da..e0a569c 100644
--- a/CheckUserLogPager.php
+++ b/CheckUserLogPager.php
@@ -12,12 +12,6 @@
}
function formatRow( $row ) {
- if ( $row->cul_reason === '' ) {
- $comment = '';
- } else {
- $comment = Linker::commentBlock( $row->cul_reason );
- }
-
$user = Linker::userLink( $row->cul_user, $row->user_name );
if ( $row->cul_type == 'userips' || $row->cul_type ==
'useredits' ) {
@@ -28,17 +22,17 @@
}
// Give grep a chance to find the usages:
- // checkuser-log-userips, checkuser-log-ipedits,
checkuser-log-ipusers,
- // checkuser-log-ipedits-xff, checkuser-log-ipusers-xff,
checkuser-log-useredits
+ // checkuser-log-entry-userips, checkuser-log-entry-ipedits,
+ // checkuser-log-entry-ipusers, checkuser-log-entry-ipedits-xff
+ // checkuser-log-entry-ipusers-xff,
checkuser-log-entry-useredits
return '<li>' .
- $this->getLanguage()->timeanddate( wfTimestamp( TS_MW,
$row->cul_timestamp ), true ) .
- $this->msg( 'comma-separator' )->text() .
$this->msg(
- 'checkuser-log-' . $row->cul_type,
+ 'checkuser-log-entry-' . $row->cul_type,
$user,
- $target
+ $target,
+ $this->getLanguage()->timeanddate( wfTimestamp(
TS_MW, $row->cul_timestamp ), true )
)->text() .
- $comment .
+ Linker::commentBlock( $row->cul_reason ) .
'</li>';
}
diff --git a/i18n/en.json b/i18n/en.json
index 3766fef..4e7809e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -67,12 +67,12 @@
"checkuser-ipeditcount": "~$1 from all users",
"checkuser-log-return": "Switch to CheckUser main form",
"checkuser-limited": "'''These results have been truncated for
performance reasons.'''",
- "checkuser-log-userips": "$1 got IP addresses for $2",
- "checkuser-log-ipedits": "$1 got edits for $2",
- "checkuser-log-ipusers": "$1 got users for $2",
- "checkuser-log-ipedits-xff": "$1 got edits for XFF $2",
- "checkuser-log-ipusers-xff": "$1 got users for XFF $2",
- "checkuser-log-useredits": "$1 got edits for $2",
+ "checkuser-log-entry-userips": "$3, $1 got IP addresses for $2",
+ "checkuser-log-entry-ipedits": "$3, $1 got edits for $2",
+ "checkuser-log-entry-ipusers": "$3, $1 got users for $2",
+ "checkuser-log-entry-ipedits-xff": "$3, $1 got edits for XFF $2",
+ "checkuser-log-entry-ipusers-xff": "$3, $1 got users for XFF $2",
+ "checkuser-log-entry-useredits": "$3, $1 got edits for $2",
"checkuser-autocreate-action": "was automatically created",
"checkuser-create-action": "was created",
"checkuser-email-action": "sent an email to user \"$1\"",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6126126..f10114a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -85,12 +85,12 @@
"checkuser-ipeditcount": "This information is shown on the result page
of [[mw:Extension:CheckUser#Basic_interface|Special:CheckUser]] (when doing the
''{{int:Checkuser-users}}'' check), next to the individual listed IPs.\n\nSee
[[mw:Extension:CheckUser#Basic_interface|screenshot]] \"Example user name
check\").\n\nParameters:\n* $1 - an estimate of the total number of edits from
the respective IP (i.e. the number of edits by all users, not only by the
requested user). As the comment in the code says: ''If we get some results, it
helps to know if the IP in general has a lot more edits, e.g. \"tip of the
iceberg\"…''",
"checkuser-log-return": "Link label on log of CheckUser searches. See
screenshot \"[[mw:Extension:CheckUser#Basic_interface|Example log]]\".",
"checkuser-limited": "A message shown above CheckUser results if the
result list would be longer than the specified limit (5000 entries), and has
been truncated.",
- "checkuser-log-userips": "This is an entry in the checkuser log when a
checkuser checks from which IP addresses a user has edited.\n\nParameters:\n*
$1 - the user who did the check\n* $2 - the user that was checked, with links
to talk page, contributions, and block (like this: [[User:Username|Username]] (
[[User talk|Talk]] | [[Special:Contributions/Username|contribs]] |
[[Special:Blockip|block]]) )\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
- "checkuser-log-ipedits": "This is an entry in the checkuser log when a
checkuser checks which edits have been done from an IP
address.\n\nParameters:\n* $1 - the user who did the check\n* $2 - the IP
address that was checked\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
- "checkuser-log-ipusers": "This is an entry in the checkuser log when a
checkuser checks which users have used an IP address.\n\nParameters:\n* $1 -
the user who did the check\n* $2 - the IP address\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
- "checkuser-log-ipedits-xff": "This is an entry in the checkuser log
when a checkuser checks which edits have been done from an XFF IP address (XFF
means X-Forwarded-For. Some providers use proxies to forward user requests.
This effectively means anonymization of requests. To make the requesting user
identifiable again, the original requesting IP is transmitted in a separate
HTTP header, the XFF header.).\n\nParameters:\n* $1 - the user who did the
check\n* $2 - the IP address that was checked\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
- "checkuser-log-ipusers-xff": "This is an entry in the checkuser log
when a checkuser checks which users have used an XFF IP address (XFF means
X-Forwarded-For. Some providers use proxies to forward user requests. This
effectively means anonymization of requests. To make the requesting user
identifiable again, the original requesting IP is transmitted in a separate
HTTP header, the XFF header.).\n\nParameters:\n* $1 - the user who did the
check\n* $2 - the IP address\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
- "checkuser-log-useredits": "This is an entry in the checkuser log when
a checkuser checks which edits have been done from an IP
address.\n\nParameters:\n* $1 - name of checkuser\n* $2 - name of user whose
edits were inspected\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
+ "checkuser-log-entry-userips": "This is an entry in the checkuser log
when a checkuser checks from which IP addresses a user has
edited.\n\nParameters:\n* $1 - the user who did the check\n* $2 - the user that
was checked, with links to talk page, contributions, and block (like this:
[[User:Username|Username]] ( [[User talk|Talk]] |
[[Special:Contributions/Username|contribs]] | [[Special:Blockip|block]]) )\n*
$3 - a formatted timestamp of the event\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
+ "checkuser-log-entry-ipedits": "This is an entry in the checkuser log
when a checkuser checks which edits have been done from an IP
address.\n\nParameters:\n* $1 - the user who did the check\n* $2 - the IP
address that was checked\n* $3 - a formatted timestamp of the event\n\nSee
screenshot \"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
+ "checkuser-log-entry-ipusers": "This is an entry in the checkuser log
when a checkuser checks which users have used an IP address.\n\nParameters:\n*
$1 - the user who did the check\n* $2 - the IP address\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
+ "checkuser-log-entry-ipedits-xff": "This is an entry in the checkuser
log when a checkuser checks which edits have been done from an XFF IP address
(XFF means X-Forwarded-For. Some providers use proxies to forward user
requests. This effectively means anonymization of requests. To make the
requesting user identifiable again, the original requesting IP is transmitted
in a separate HTTP header, the XFF header.).\n\nParameters:\n* $1 - the user
who did the check\n* $2 - the IP address that was checked\n* $3 - a formatted
timestamp of the event\n\nSee screenshot
\"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
+ "checkuser-log-entry-ipusers-xff": "This is an entry in the checkuser
log when a checkuser checks which users have used an XFF IP address (XFF means
X-Forwarded-For. Some providers use proxies to forward user requests. This
effectively means anonymization of requests. To make the requesting user
identifiable again, the original requesting IP is transmitted in a separate
HTTP header, the XFF header.).\n\nParameters:\n* $1 - the user who did the
check\n* $2 - the IP address\n* $3 - a formatted timestamp of the event\n\nSee
screenshot \"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
+ "checkuser-log-entry-useredits": "This is an entry in the checkuser log
when a checkuser checks which edits have been done from an IP
address.\n\nParameters:\n* $1 - name of checkuser\n* $2 - name of user whose
edits were inspected\n* $3 - a formatted timestamp of the event\n\nSee
screenshot \"[[mw:Extension:CheckUser#Basic_interface|Example
log]]\".\n{{Related|Checkuser-log}}",
"checkuser-autocreate-action": "Text of the event displayed in the
CheckUser results, corresponding to the automatic creation of a new user
account (by CentralAuth).",
"checkuser-create-action": "Text of the event displayed in the
CheckUser results. Indicates creation of the user.",
"checkuser-email-action": "Logged text when a user sends an e-mail.
Probably preceded by the name of the checkuser.\n\nParameters:\n* $1 - a salted
MD5 hash for the user an email was sent to",
--
To view, visit https://gerrit.wikimedia.org/r/52237
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife21fd09aa6d0c74241dbd7b9130b10292f306ac
Gerrit-PatchSet: 13
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: saper <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Liangent <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Snowolf <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: saper <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
