Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/140367
Change subject: Remove padding for non-numeric page labels in pagelist display
......................................................................
Remove padding for non-numeric page labels in pagelist display
Change-Id: I3d68eeeb137da4fdf00bd0a7f79d9b704111f5e3
---
M includes/Pagination/PageNumber.php
M includes/Parser/PagelistTagParser.php
M tests/includes/Pagination/PageNumberTest.php
3 files changed, 19 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/67/140367/1
diff --git a/includes/Pagination/PageNumber.php
b/includes/Pagination/PageNumber.php
index 5ed195c..a6b687b 100644
--- a/includes/Pagination/PageNumber.php
+++ b/includes/Pagination/PageNumber.php
@@ -83,6 +83,13 @@
}
/**
+ * @return bool
+ */
+ public function isNumeric() {
+ return is_numeric( $this->number );
+ }
+
+ /**
* @return array
*/
public static function getDisplayModes() {
diff --git a/includes/Parser/PagelistTagParser.php
b/includes/Parser/PagelistTagParser.php
index 45096a3..69c8070 100644
--- a/includes/Parser/PagelistTagParser.php
+++ b/includes/Parser/PagelistTagParser.php
@@ -61,12 +61,12 @@
$view = ' ' . $view;
}
- $n = strlen( $count ) - mb_strlen( $view );
- if ( $n && $mode == PageNumber::DISPLAY_NORMAL ) {
+ $paddingSize = strlen( $count ) - mb_strlen( $view );
+ if ( $paddingSize > 0 && $mode ==
PageNumber::DISPLAY_NORMAL && $pageNumber->isNumeric() ) {
$txt = '<span style="visibility:hidden;">';
$pad = $title->getPageLanguage()->formatNum( 0,
true );
- for ( $j = 0; $j < $n; $j++ ) {
- $txt = $txt . $pad;
+ for ( $j = 0; $j < $paddingSize; $j++ ) {
+ $txt .= $pad;
}
$view = $txt . '</span>' . $view;
}
diff --git a/tests/includes/Pagination/PageNumberTest.php
b/tests/includes/Pagination/PageNumberTest.php
index b04f37a..898229d 100644
--- a/tests/includes/Pagination/PageNumberTest.php
+++ b/tests/includes/Pagination/PageNumberTest.php
@@ -44,4 +44,12 @@
$number = new PageNumber( '10' );
$this->assertEquals( $number->getDisplayMode(),
PageNumber::DISPLAY_NORMAL );
}
+
+ public function testIsNumerci() {
+ $number = new PageNumber( '10', PageNumber::DISPLAY_ROMAN );
+ $this->assertTrue( $number->isNumeric() );
+
+ $number = new PageNumber( 'a' );
+ $this->assertFalse( $number->isNumeric() );
+ }
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/140367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d68eeeb137da4fdf00bd0a7f79d9b704111f5e3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
