Replace 'old-revision-navigation' message with 'revision-info' and 'revision-nav...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9454197..f7bc31e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -185,11 +185,13 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6839) Wikibits.js minor changes to make JS-lint happier.
 * (bug 7932) Make sure that edit toolbar clears floats so it appears correctly.
 * (bug 6873) When viewing old revisions, add link to diff to current version.
-* (bug 3315) Allow rollback directly from history page.
+* (bug 3315) Provide rollback link directly on history page.
 * Detect CGI configurations where PATH_INFO is set up correctly.
   PHP config var cgi.fix_pathinfo isn't detectable through ini_get(), but
   we can find some side-effects. Only tested on lighttpd so far, hopefully
   right on Apache too!
+* Replace 'old-revision-navigation' message with 'revision-info' and
+  'revision-nav' messages, wrapped in divs with appropriate id's.
 
 
 == Languages updated ==

diff --git a/includes/Article.php b/includes/Article.php
index 39e2c4b..832d806 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2303,7 +2303,8 @@ class Article {
                $userlinks = $sk->userLink( $revision->getUser(), $revision->getUserText() )
                                                . $sk->userToolLinks( $revision->getUser(), $revision->getUserText() );
                
-               $r = wfMsg( 'old-revision-navigation', $td, $lnk, $prevlink, $nextlink, $userlinks, $prevdiff, $nextdiff, $curdiff );
+               $r = "\n\t\t\t\t<div id=\"mw-revision-info\">" . wfMsg( 'revision-info', $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 ff9c24e..c16609c 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -998,7 +998,10 @@ Please check the URL you used to access this page.",
 'loadhist'             => 'Loading page history',
 'currentrev'   => 'Current revision',
 'revisionasof'          => 'Revision as of $1',
-'old-revision-navigation' => 'Revision as of $1; $5<br />($6) $3 | $2 ($8) | $4 ($7)',
+# 'old-revision-navigation' has been superseded by revision-info/nav. There's no need to translate it.
+'old-revision-navigation' => 'Revision as of $1 by $5<br />($6) $3 | $2 ($8) | $4 ($7)',
+'revision-info' => 'Revision as of $1 by $2',
+'revision-nav' => '($1) $2 | $3 ($4) | $5 ($6)',
 'previousrevision'     => '←Older revision',
 'nextrevision'         => 'Newer revision→',
 'currentrevisionlink'   => 'Current revision',
@@ -1027,6 +1030,7 @@ there may be details in the [{{fullurl:Special:Log/delete|page={{PAGENAMEE}}}} d
 #'rev-delundel' => 'del/undel',
 'rev-delundel' => 'show/hide',
 
+
 'history-feed-title' => 'Revision history',
 'history-feed-description'     => 'Revision history for this page on the wiki',
 'history-feed-item-nocomment' => '$1 at $2', # user at time