r24491 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r24490‎ | r24491 | r24492 >
Date:13:59, 31 July 2007
Author:raymond
Status:old
Tags:
Comment:
Adding new parameter $8 with the begin of a block to 'blockedtext' and 'autoblockedtext'.
I think there is no need for new message name to not break existing localizations.
It was a request of the German OTRS team which handles a lot of block complains.
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
@@ -745,6 +745,7 @@
746746
747747 $id = $wgUser->blockedBy();
748748 $reason = $wgUser->blockedFor();
 749+ $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true );
749750 $ip = wfGetIP();
750751
751752 if ( is_numeric( $id ) ) {
@@ -784,8 +785,8 @@
785786 * This could be a username, an ip range, or a single ip. */
786787 $intended = $wgUser->mBlock->mAddress;
787788
788 - $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) );
789 -
 789+ $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ) );
 790+
790791 # Don't auto-return to special pages
791792 if( $return ) {
792793 $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL;
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -937,8 +937,9 @@
938938
939939 The block was made by $1. The reason given is ''$2''.
940940
941 -Expiry of block: $6<br />
942 -Intended blockee: $7
 941+* Begin of block: $8
 942+* Expiry of block: $6
 943+* Intended blockee: $7
943944
944945 You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block.
945946 You cannot use the 'email this user' feature unless a valid email address is specified in your
@@ -949,7 +950,8 @@
950951
951952 :\'\'$2\'\'
952953
953 -Expiry of block: $6
 954+* Begin of block: $8
 955+* Expiry of block: $6
954956
955957 You may contact $1 or one of the other
956958 [[{{MediaWiki:grouppage-sysop}}|administrators]] to discuss the block.

Follow-up revisions

RevisionCommit summaryAuthorDate
r24631Merged revisions 24480-24600 via svnmerge from...david18:39, 6 August 2007

Status & tagging log