http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84432

Revision: 84432
Author:   siebrand
Date:     2011-03-20 23:11:59 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
Split date and time in 'revreview-poss-conflict-c' and 
'revreview-poss-conflict-p' and simplified the messages.

Modified Paths:
--------------
    trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
    trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php

Modified: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php   2011-03-20 
22:46:09 UTC (rev 84431)
+++ trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php   2011-03-20 
23:11:59 UTC (rev 84432)
@@ -714,7 +714,7 @@
                if ( $u !== null && $u != $user->getName() ) {
                        $msg = $refId ? 'revreview-poss-conflict-c' : 
'revreview-poss-conflict-p';
                        $form .= '<p><span class="fr-under-review">' .
-                               wfMsgExt( $msg, 'parseinline', $u, 
$wgLang->timeanddate( $ts, true ) ) .
+                               wfMsgExt( $msg, 'parseinline', $u, 
$wgLang->date( $ts, true ), $wgLang->time( $ts, true ) ) .
                                        '</span></p>';
                }
 

Modified: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
===================================================================
--- trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php  2011-03-20 
22:46:09 UTC (rev 84431)
+++ trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php  2011-03-20 
23:11:59 UTC (rev 84432)
@@ -192,8 +192,8 @@
        'revreview-submit-unreviewed'  => 'Done. Unaccepted!',
        'revreview-successful'         => '\'\'\'Revision of [[:$1|$1]] 
successfully flagged. ([{{fullurl:{{#Special:ReviewedVersions}}|page=$2}} view 
reviewed versions])\'\'\'',
        'revreview-successful2'        => '\'\'\'Revision of [[:$1|$1]] 
successfully unflagged.\'\'\'',
-       'revreview-poss-conflict-p'    => '\'\'\'Warning: Another user, 
[[User:$1|$1]], just started reviewing this page at $2.\'\'\'',
-       'revreview-poss-conflict-c'    => '\'\'\'Warning: Another user, 
[[User:$1|$1]], just started reviewing these changes at $2.\'\'\'',
+       'revreview-poss-conflict-p'    => '\'\'\'Warning: [[User:$1|$1]] 
started reviewing this page on $2 at $3.\'\'\'',
+       'revreview-poss-conflict-c'    => '\'\'\'Warning: [[User:$1|$1]] 
started reviewing these changes on $2 at $3.\'\'\'',
        'revreview-toggle-show'        => '(+)',
        'revreview-toggle-hide'        => '(-)',
        'revreview-toggle-title'       => 'show/hide details',


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to