r60662 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r60661‎ | r60662 | r60663 >
Date:12:48, 5 January 2010
Author:jojo
Status:ok
Tags:
Comment:
different pages for single-page vs. collection
Modified paths:
  • /trunk/extensions/Collection/Collection.i18n.php (modified) (history)
  • /trunk/extensions/Collection/Collection.templates.php (modified) (history)
  • /trunk/extensions/Collection/README.txt (modified) (history)

Diff [purge]

Index: trunk/extensions/Collection/Collection.i18n.php
@@ -111,7 +111,8 @@
112112 'coll-rendering_status' => "<strong>Status:</strong> $1",
113113 'coll-rendering_article' => '(wiki page: $1)',
114114 'coll-rendering_page' => '(page: $1)',
115 - 'coll-rendering_info_text_article' => '{{MediaWiki:Coll-helppage}}/Rendering info text',
 115+ 'coll-rendering_page_info_text_article' => '{{MediaWiki:Coll-helppage}}/Rendering page info text',
 116+ 'coll-rendering_collection_info_text_article' => '{{MediaWiki:Coll-helppage}}/Rendering collection info text',
116117 'coll-rendering_finished_title' => 'Rendering finished',
117118 'coll-rendering_finished_text' => "<strong>The document file has been generated.</strong>
118119 <strong>[$1 Download the file]</strong> to your computer.
Index: trunk/extensions/Collection/README.txt
@@ -263,10 +263,13 @@
264264 The default value is: {{MediaWiki:Coll-helppage}}/PediaPress order information
265265 i.e. a subpage of the configured help page named "PediaPress order information".
266266
267 -* Coll-rendering_info_text_article: The name of a wiki page with additional
268 - informations to be displayed when documents are being rendered.
 267+* Coll-rendering_page_info_text_article: The name of a wiki page with additional
 268+ informations to be displayed when single pages are being rendered.
269269
 270+* Coll-rendering_collection_info_text_article: The name of a wiki page with additional
 271+ informations to be displayed when collections are being rendered.
270272
 273+
271274 .. _mwlib: http://code.pediapress.com/wiki/wiki/mwlib
272275 .. _MediaWiki: http://www.mediawiki.org/
273276 .. _`PediaPress GmbH`: http://pediapress.com/
Index: trunk/extensions/Collection/Collection.templates.php
@@ -349,7 +349,11 @@
350350 <?php echo wfMsg('coll-rendering_text', $GLOBALS['wgLang']->formatNum($this->data['progress']), $this->data['status']) ?>
351351
352352 <?php
353 - $title_string = wfMsgForContent('coll-rendering_info_text_article');
 353+ if ( CollectionSession::isEnabled() ) {
 354+ $title_string = wfMsgForContent('coll-rendering_collection_info_text_article');
 355+ } else {
 356+ $title_string = wfMsgForContent('coll-rendering_page_info_text_article');
 357+ }
354358 $t = Title::newFromText($title_string);
355359 if ( $t && $t->exists() ) {
356360 echo $GLOBALS['wgParser']->parse('{{:' . $t . '}}',

Status & tagging log