http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94151
Revision: 94151
Author: devayon
Date: 2011-08-10 12:34:19 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
fw: r94147
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
===================================================================
---
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-10 11:23:16 UTC (rev 94150)
+++
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_QueryUIHelper.php
2011-08-10 12:34:19 UTC (rev 94151)
@@ -248,7 +248,7 @@
* one may overload getUrlTail();
*
* @global int $smwgQMaxInlineLimit
- * @global Language $wgContLang
+ * @global Language $wgLang
* @param int $limit
* @param int $offset
* @param boolean $hasFurtherResults
@@ -256,7 +256,7 @@
* @return string
*/
public function getNavigationBar( $limit, $offset, $hasFurtherResults )
{
- global $smwgQMaxInlineLimit, $wgContLang;
+ global $smwgQMaxInlineLimit, $wgLang;
$url_tail = $this->getUrlTail();
// Prepare navigation bar.
if ( $offset > 0 ) {
@@ -276,8 +276,8 @@
$previous = wfMsg( 'smw_result_prev' );
}
$space = '    ';
- $first_digit = $wgContLang->formatNum( $offset + 1 );
- $last_digit = $wgContLang->formatNum( $offset +
$this->uiCore->getResultCount() );
+ $first_digit = $wgLang->formatNum( $offset + 1 );
+ $last_digit = $wgLang->formatNum( $offset +
$this->uiCore->getResultCount() );
if ( $hasFurtherResults ) {
$next = Html::element(
@@ -317,18 +317,30 @@
),
'rel' => 'nofollow'
),
- $wgContLang->formatNum( $l, false )
+ $wgLang->formatNum( $l, false )
);
} else {
- $limit_choices .= '<b>' .
$wgContLang->formatNum( $l ) . '</b>';
+ $limit_choices .= '<b>' . $wgLang->formatNum(
$l ) . '</b>';
}
}
+ $limit_choices .= ')';
- $limit_choices .= ')';
- if ( $wgContLang->isRTL() ) { // right to left
- $navigation = "$limit_choices $next $space
<b>$last_digit - $first_digit " . wfMsg( 'smw_result_results' ) . "</b> $space
$previous";
+ if ( $wgLang->isRTL() ) { // right to left
+ $navigation = $limit_choices .
+ "$space $next $space" .
+ Html::rawElement(
'strong', array(),
+ " $last_digit -
$first_digit " .
+ wfMsg(
'smw_result_results' )
+ ) .
+ "$space $previous
$space";
} else { // left to right
- $navigation = "$space $previous $space <b>" . wfMsg(
'smw_result_results' ) . " $first_digit - $last_digit</b> $space $next $space
$limit_choices";
+ $navigation = "$space $previous $space" .
+ Html::rawElement(
'strong', array(),
+ wfMsg(
'smw_result_results' ) .
+ " $first_digit
- $last_digit "
+ ) .
+ "$space $next $space" .
+ $limit_choices;
}
return $navigation;
}
@@ -1685,4 +1697,4 @@
}
}
-}
+ }
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
