http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73430
Revision: 73430
Author: tomasz
Date: 2010-09-21 00:12:07 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
Picking up latest changes
Modified Paths:
--------------
branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.i18n.php
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerAllocation.php
Property Changed:
----------------
branches/wmf/1.16wmf4/extensions/CentralNotice/
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/wmf-deployment/extensions/CentralNotice:60970
/trunk/extensions/CentralNotice:62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753,71774-71997,72058-72131,72136-73405
/trunk/phase3/extensions/CentralNotice:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
+ /branches/wmf-deployment/extensions/CentralNotice:60970
/trunk/extensions/CentralNotice:62820-67552,67557,67559-71720,71725-71731,71734-71739,71748-71753,71774-71997,72058-72131,72136-73406
/trunk/phase3/extensions/CentralNotice:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
Modified: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.i18n.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.i18n.php
2010-09-21 00:07:21 UTC (rev 73429)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.i18n.php
2010-09-21 00:12:07 UTC (rev 73430)
@@ -131,7 +131,6 @@
'centralnotice-no-allocation' => 'No banners allocated.',
'centralnotice-allocation-description' => 'Banner allocation for $1.$2
in $3:',
'centralnotice-percentage' => 'Percentage',
- 'centralnotice-percent' => '$1%',
'right-centralnotice-admin' => 'Manage central notices',
'right-centralnotice-translate' => 'Translate central notices',
@@ -194,7 +193,6 @@
'centralnotice-insert' => '{{Identical|Insert}}',
'centralnotice-geotargeted' => 'Used to label a checkbox which
activates geotargeting',
'centralnotice-allocation-description' => 'A description of the
environment whose allocation is being described. $1 is the language code for
the site (en). $2 is the project name for the site (wikipedia). $3 is the
country code (US).',
- 'centralnotice-percent' => 'A percentage as a number. $1 is the
number.',
'right-centralnotice-admin' => '{{doc-right}}',
'right-centralnotice-translate' => '{{doc-right}}',
Modified:
branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerAllocation.php
===================================================================
--- branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerAllocation.php
2010-09-21 00:07:21 UTC (rev 73429)
+++ branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerAllocation.php
2010-09-21 00:12:07 UTC (rev 73430)
@@ -124,7 +124,7 @@
* Show a list of banners with allocation. Newer banners are shown
first.
*/
function showList() {
- global $wgRequest, $wgOut, $wgUser, $wgRequest;
+ global $wgRequest, $wgOut, $wgUser, $wgRequest, $wgLang;
$sk = $wgUser->getSkin();
$viewPage = $this->getTitleFor( 'NoticeTemplate', 'view' );
@@ -165,7 +165,7 @@
$htmlOut .= Xml::openElement( 'tr' );
$htmlOut .= Xml::openElement( 'td' );
$percentage = ( $banner['weight'] /
$totalWeight ) * 100;
- $htmlOut .= wfMsg ( 'centralnotice-percent',
$percentage );
+ $htmlOut .= wfMsg ( 'percent',
$wgLang->formatNum( $percentage ) );
$htmlOut .= Xml::closeElement( 'td' );
$htmlOut .= Xml::tags( 'td', array( 'valign' =>
'top' ),
$sk->makeLinkObj( $viewPage,
htmlspecialchars( $banner['name'] ), 'template=' . urlencode( $banner['name'] )
)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
