(bug 9328) Use "revision-info-current" message in place of "revision-info" when viewi...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bff43de..d124d85 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -89,6 +89,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Kurdish interface latin/arabic writing system with transliteration
 * Support wiki text in all query page headers
 * Add 'Orphanedpages' as an alias to Special:Lonelypages
+* (bug 9328) Use "revision-info-current" message in place of "revision-info"
+  when viewing the current revision of a page, if available
 
 == Bugfixes since 1.10 ==
 

diff --git a/includes/Article.php b/includes/Article.php
index 0efa3ea..ddf5b25 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2424,7 +2424,12 @@ class Article {
                $userlinks = $sk->userLink( $revision->getUser(), $revision->getUserText() )
                                                . $sk->userToolLinks( $revision->getUser(), $revision->getUserText() );
 
-               $r = "\n\t\t\t\t<div id=\"mw-revision-info\">" . wfMsg( 'revision-info', $td, $userlinks ) . "</div>\n" .
+               $m = wfMsg( 'revision-info-current' );
+               $infomsg = $current && !wfEmptyMsg( 'revision-info-current', $m ) && $m != '-'
+                       ? 'revision-info-current'
+                       : 'revision-info';
+                       
+               $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsg( $infomsg, $td, $userlinks ) . "</div>\n" .
                     "\n\t\t\t\t<div id=\"mw-revision-nav\">" . wfMsg( 'revision-nav', $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t";
                $wgOut->setSubtitle( $r );
        }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index cc9ff67..3512182 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1072,6 +1072,7 @@ Please check the URL you used to access this page.',
 'currentrev'          => 'Current revision',
 'revisionasof'        => 'Revision as of $1',
 'revision-info'       => 'Revision as of $1 by $2',
+'revision-info-current' => 'Revision as of $1 by $2 (current!)',
 'revision-nav'        => '($1) $2 | $3 ($4) | $5 ($6)', # don't translate or duplicate this message to other languages
 'previousrevision'    => '←Older revision',
 'nextrevision'        => 'Newer revision→',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 1b731b2..24ea1b4 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -86,6 +86,7 @@ $wgIgnoredMessages = array(
        'pubmedurl',
        'randompage-url',
        'recentchanges-url',
+       'revision-info-current',
        'revision-nav',
        'rfcurl',
        'shareddescriptionfollows',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 9842052..0707ba2 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -526,6 +526,7 @@ $wgMessageStructure = array(
                'currentrev',
                'revisionasof',
                'revision-info',
+               'revision-info-current',
                'revision-nav',
                'previousrevision',
                'nextrevision',