r84432 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r84431‎ | r84432 | r84433 >
Date:23:11, 20 March 2011
Author:siebrand
Status:ok
Tags:
Comment:
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 (modified) (history)
  • /trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
@@ -192,8 +192,8 @@
193193 'revreview-submit-unreviewed' => 'Done. Unaccepted!',
194194 'revreview-successful' => '\'\'\'Revision of [[:$1|$1]] successfully flagged. ([{{fullurl:{{#Special:ReviewedVersions}}|page=$2}} view reviewed versions])\'\'\'',
195195 'revreview-successful2' => '\'\'\'Revision of [[:$1|$1]] successfully unflagged.\'\'\'',
196 - 'revreview-poss-conflict-p' => '\'\'\'Warning: Another user, [[User:$1|$1]], just started reviewing this page at $2.\'\'\'',
197 - 'revreview-poss-conflict-c' => '\'\'\'Warning: Another user, [[User:$1|$1]], just started reviewing these changes at $2.\'\'\'',
 196+ 'revreview-poss-conflict-p' => '\'\'\'Warning: [[User:$1|$1]] started reviewing this page on $2 at $3.\'\'\'',
 197+ 'revreview-poss-conflict-c' => '\'\'\'Warning: [[User:$1|$1]] started reviewing these changes on $2 at $3.\'\'\'',
198198 'revreview-toggle-show' => '(+)',
199199 'revreview-toggle-hide' => '(-)',
200200 'revreview-toggle-title' => 'show/hide details',
Index: trunk/extensions/FlaggedRevs/forms/RevisionReviewForm.php
@@ -714,7 +714,7 @@
715715 if ( $u !== null && $u != $user->getName() ) {
716716 $msg = $refId ? 'revreview-poss-conflict-c' : 'revreview-poss-conflict-p';
717717 $form .= '<p><span class="fr-under-review">' .
718 - wfMsgExt( $msg, 'parseinline', $u, $wgLang->timeanddate( $ts, true ) ) .
 718+ wfMsgExt( $msg, 'parseinline', $u, $wgLang->date( $ts, true ), $wgLang->time( $ts, true ) ) .
719719 '</span></p>';
720720 }
721721

Status & tagging log