| Index: trunk/extensions/Collection/Collection.php |
| — | — | @@ -177,11 +177,16 @@ |
| 178 | 178 | $wgAjaxExportList[] = 'wfAjaxPostCollection'; |
| 179 | 179 | |
| 180 | 180 | function wfAjaxGetMWServeStatus( $collection_id = '', $writer = 'rl' ) { |
| | 181 | + global $wgLang; |
| | 182 | + |
| 181 | 183 | $json = new Services_JSON(); |
| 182 | 184 | $result = SpecialCollection::mwServeCommand( 'render_status', array( |
| 183 | 185 | 'collection_id' => $collection_id, |
| 184 | 186 | 'writer' => $writer |
| 185 | 187 | ) ); |
| | 188 | + if ( isset( $result['status']['progress'] ) ) { |
| | 189 | + $result['status']['progress'] = $wgLang->parseFormattedNumber( number_format( $result['status']['progress'], 2 ) ); |
| | 190 | + } |
| 186 | 191 | $r = new AjaxResponse( $json->encode( $result ) ); |
| 187 | 192 | $r->setContentType( 'application/json' ); |
| 188 | 193 | return $r; |
| Index: trunk/extensions/Collection/Collection.templates.php |
| — | — | @@ -349,7 +349,7 @@ |
| 350 | 350 | <span style="display:none" id="renderingArticle"><?php echo ' ' . wfMsg( 'coll-rendering_article', '%PARAM%' ) ?></span> |
| 351 | 351 | <span style="display:none" id="renderingPage"><?php echo ' ' . wfMsg( 'coll-rendering_page', '%PARAM%' ) ?></span> |
| 352 | 352 | |
| 353 | | -<?php echo wfMsg( 'coll-rendering_text', $GLOBALS['wgLang']->formatNum( $this->data['progress'] ), $this->data['status'] ) ?> |
| | 353 | +<?php echo wfMsg( 'coll-rendering_text', $GLOBALS['wgLang']->parseFormattedNumber( number_format( $this->data['progress'], 2 ) ), $this->data['status'] ) ?> |
| 354 | 354 | |
| 355 | 355 | <?php |
| 356 | 356 | if ( CollectionSession::isEnabled() ) { |