jenkins-bot has submitted this change and it was merged.
Change subject: API: Clarify cutimecond behaviour in docs/errors
......................................................................
API: Clarify cutimecond behaviour in docs/errors
Bug: T94745
Change-Id: I897ad988de8cc2111f28c5619d26ab8d83283943
---
M api/ApiQueryCheckUser.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Glaisher: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/api/ApiQueryCheckUser.php b/api/ApiQueryCheckUser.php
index 8d08a40..89fa4b8 100644
--- a/api/ApiQueryCheckUser.php
+++ b/api/ApiQueryCheckUser.php
@@ -29,7 +29,7 @@
$reason = $this->msg( 'checkuser-reason-api', $reason
)->inContentLanguage()->text();
$timeCutoff = strtotime( $timecond ); // absolute time
if ( !$timeCutoff ) {
- $this->dieUsage( 'You need use correct time limit (like
"2 weeks")', 'invalidtime' );
+ $this->dieUsage( 'You need use correct time limit (like
"-2 weeks" or "2 weeks ago")', 'invalidtime' );
}
$this->addTables( 'cu_changes' );
@@ -270,7 +270,7 @@
'target' => "Username or IP-address/range to perform
check",
'reason' => 'Reason to check',
'limit' => 'Limit of rows',
- 'timecond' => 'Time limit of user data (like "2
weeks")',
+ 'timecond' => 'Time limit of user data (like "-2 weeks"
or "2 weeks ago")',
'xff' => 'Use xff data instead of IP',
);
}
diff --git a/i18n/en.json b/i18n/en.json
index 80b6f98..435f7c6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -89,7 +89,7 @@
"apihelp-query+checkuser-param-target": "Username, IP address, or CIDR
range to check.",
"apihelp-query+checkuser-param-reason": "Reason to check.",
"apihelp-query+checkuser-param-limit": "Limit of rows.",
- "apihelp-query+checkuser-param-timecond": "Time limit of user data
(like \"2 weeks\").",
+ "apihelp-query+checkuser-param-timecond": "Time limit of user data
(like \"-2 weeks\" or \"2 weeks ago\").",
"apihelp-query+checkuser-param-xff": "Use XFF data instead of IP
address.",
"apihelp-query+checkuser-example-1": "Check IP addresses for
[[User:Example]]",
"apihelp-query+checkuser-example-2": "Check edits from 192.0.2.0/24",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 7618add..8df6e82 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -108,7 +108,7 @@
"apihelp-query+checkuser-param-target":
"{{doc-apihelp-param|query+checkuser|target}}",
"apihelp-query+checkuser-param-reason":
"{{doc-apihelp-param|query+checkuser|reason}}",
"apihelp-query+checkuser-param-limit":
"{{doc-apihelp-param|query+checkuser|limit}}",
- "apihelp-query+checkuser-param-timecond": "Do not translate \"2
weeks\". It must be in [http://www.php.net/strtotime original
format].\n----\n{{doc-apihelp-param|query+checkuser|timecond}}",
+ "apihelp-query+checkuser-param-timecond": "Do not translate \"-2
weeks\" or \"2 weeks ago\". It must be in [http://www.php.net/strtotime
original format].\n----\n{{doc-apihelp-param|query+checkuser|timecond}}",
"apihelp-query+checkuser-param-xff":
"{{doc-apihelp-param|query+checkuser|xff}}",
"apihelp-query+checkuser-example-1":
"{{doc-apihelp-example|query+checkuser}}",
"apihelp-query+checkuser-example-2":
"{{doc-apihelp-example|query+checkuser}}",
--
To view, visit https://gerrit.wikimedia.org/r/268930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I897ad988de8cc2111f28c5619d26ab8d83283943
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Glaisher <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
