r73430 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r73429‎ | r73430 | r73431 >
Date:00:12, 21 September 2010
Author:tomasz
Status:deferred
Tags:
Comment:
Picking up latest changes
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/CentralNotice (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.i18n.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerAllocation.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.i18n.php
@@ -131,7 +131,6 @@
132132 'centralnotice-no-allocation' => 'No banners allocated.',
133133 'centralnotice-allocation-description' => 'Banner allocation for $1.$2 in $3:',
134134 'centralnotice-percentage' => 'Percentage',
135 - 'centralnotice-percent' => '$1%',
136135
137136 'right-centralnotice-admin' => 'Manage central notices',
138137 'right-centralnotice-translate' => 'Translate central notices',
@@ -194,7 +193,6 @@
195194 'centralnotice-insert' => '{{Identical|Insert}}',
196195 'centralnotice-geotargeted' => 'Used to label a checkbox which activates geotargeting',
197196 '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).',
198 - 'centralnotice-percent' => 'A percentage as a number. $1 is the number.',
199197
200198 'right-centralnotice-admin' => '{{doc-right}}',
201199 'right-centralnotice-translate' => '{{doc-right}}',
Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerAllocation.php
@@ -124,7 +124,7 @@
125125 * Show a list of banners with allocation. Newer banners are shown first.
126126 */
127127 function showList() {
128 - global $wgRequest, $wgOut, $wgUser, $wgRequest;
 128+ global $wgRequest, $wgOut, $wgUser, $wgRequest, $wgLang;
129129
130130 $sk = $wgUser->getSkin();
131131 $viewPage = $this->getTitleFor( 'NoticeTemplate', 'view' );
@@ -165,7 +165,7 @@
166166 $htmlOut .= Xml::openElement( 'tr' );
167167 $htmlOut .= Xml::openElement( 'td' );
168168 $percentage = ( $banner['weight'] / $totalWeight ) * 100;
169 - $htmlOut .= wfMsg ( 'centralnotice-percent', $percentage );
 169+ $htmlOut .= wfMsg ( 'percent', $wgLang->formatNum( $percentage ) );
170170 $htmlOut .= Xml::closeElement( 'td' );
171171 $htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),
172172 $sk->makeLinkObj( $viewPage, htmlspecialchars( $banner['name'] ), 'template=' . urlencode( $banner['name'] ) )
Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice
___________________________________________________________________
Modified: svn:mergeinfo
173173 Merged /trunk/extensions/CentralNotice:r73406

Status & tagging log