jenkins-bot has submitted this change and it was merged.
Change subject: Show range start and end in special page pagination
......................................................................
Show range start and end in special page pagination
Changes pagination message from "starting with #X" to
"in range #X to #Y" for special pages such as
Special:MostLinkedCategories
Bug: 11269
Change-Id: Ibf9191f3a694014ad02eba9a58c600833e8361ec
---
M includes/QueryPage.php
M languages/messages/MessagesEn.php
M languages/messages/MessagesQqq.php
M maintenance/language/messages.inc
4 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 7c2f8f7..bb6a0c3 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -543,9 +543,9 @@
if ( $this->shownavigation ) {
$out->addHTML( $this->getPageHeader() );
if ( $this->numRows > 0 ) {
- $out->addHTML( $this->msg( 'showingresults'
)->numParams(
+ $out->addHTML( $this->msg(
'showingresultsinrange' )->numParams(
min( $this->numRows, $this->limit ), #
do not show the one extra row, if exist
- $this->offset + 1 )->parseAsBlock() );
+ $this->offset + 1, (min(
$this->numRows, $this->limit ) + $this->offset) )->parseAsBlock() );
# Disable the "next" link when we reach the end
$paging = $this->getLanguage()->viewPrevNext(
$this->getPageTitle( $par ), $this->offset,
$this->limit, $this->linkParameters(),
( $this->numRows <= $this->limit ) );
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index fa0a354..497d2e7 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1855,6 +1855,7 @@
'searchrelated' => 'related',
'searchall' => 'all',
'showingresults' => "Showing below up to
{{PLURAL:$1|<strong>1</strong> result|<strong>$1</strong> results}} starting
with #<strong>$2</strong>.",
+'showingresultsinrange' => "Showing below up to
{{PLURAL:$1|<strong>1</strong> result|<strong>$1</strong> results}} in range
#<strong>$2</strong> to #<strong>$3</strong>.",
'showingresultsnum' => "Showing below
{{PLURAL:$3|<strong>1</strong> result|<strong>$3</strong> results}} starting
with #<strong>$2</strong>.",
'showingresultsheader' => "{{PLURAL:$5|Result <strong>$1</strong>
of <strong>$3</strong>|Results <strong>$1 - $2</strong> of
<strong>$3</strong>}} for <strong>$4</strong>",
'search-nonefound' => 'There were no results matching the
query.',
diff --git a/languages/messages/MessagesQqq.php
b/languages/messages/MessagesQqq.php
index dedf6f1..901cc2c 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -2992,6 +2992,10 @@
* $3 - total number of results
* $4 - the search term
* $5 - number of results',
+'showingresultsinrange' => 'Used in pagination of
[[Special:MostLinkedCategories]]. Parameters:
+* $1 - the total number of results in the batch shown
+* $2 - the number of the first item listed
+* $3 - the number of last item in the batch shown',
'search-nonefound' => 'Message shown when a search returned no results (when
using the default MediaWiki search engine).',
'powersearch-legend' => 'Advanced search
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index f9eb675..ed85223 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -991,6 +991,7 @@
'searchrelated',
'searchall',
'showingresults',
+ 'showingresultsinrange',
'showingresultsnum',
'showingresultsheader',
'search-nonefound',
--
To view, visit https://gerrit.wikimedia.org/r/111330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf9191f3a694014ad02eba9a58c600833e8361ec
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Adi.iiita <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: TTO <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
