| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -748,8 +748,6 @@ |
| 749 | 749 | SpecialPage::getTitleFor( 'Undelete', $this->mTargetObj->getPrefixedDBkey() ), |
| 750 | 750 | htmlspecialchars( $this->mTargetObj->getPrefixedText() ) |
| 751 | 751 | ); |
| 752 | | - $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) ); |
| 753 | | - $user = $skin->revUserTools( $rev ); |
| 754 | 752 | |
| 755 | 753 | if( $this->mDiff ) { |
| 756 | 754 | $previousRev = $archive->getPreviousRevision( $timestamp ); |
| — | — | @@ -765,8 +763,15 @@ |
| 766 | 764 | } |
| 767 | 765 | } |
| 768 | 766 | |
| 769 | | - $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user ) . '</p>' ); |
| | 767 | + // date and time are separate parameters to facilitate localisation. |
| | 768 | + // $time is kept for backward compat reasons. |
| | 769 | + $time = htmlspecialchars( $wgLang->timeAndDate( $timestamp, true ) ); |
| | 770 | + $d = htmlspecialchars( $wgLang->date( $timestamp, true ) ); |
| | 771 | + $t = htmlspecialchars( $wgLang->time( $timestamp, true ) ); |
| | 772 | + $user = $skin->revUserTools( $rev ); |
| 770 | 773 | |
| | 774 | + $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user, $t, $d ) . '</p>' ); |
| | 775 | + |
| 771 | 776 | wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) ); |
| 772 | 777 | |
| 773 | 778 | if( $this->mPreview ) { |
| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -558,7 +558,13 @@ |
| 559 | 559 | |
| 560 | 560 | if ($wgEmailAuthentication && ($this->mUserEmail != '') ) { |
| 561 | 561 | if( $wgUser->getEmailAuthenticationTimestamp() ) { |
| 562 | | - $emailauthenticated = wfMsg('emailauthenticated',$wgLang->timeanddate($wgUser->getEmailAuthenticationTimestamp(), true ) ).'<br />'; |
| | 562 | + // date and time are separate parameters to facilitate localisation. |
| | 563 | + // $time is kept for backward compat reasons. |
| | 564 | + // 'emailauthenticated' is also used in SpecialConfirmemail.php |
| | 565 | + $time = $wgLang->timeAndDate( $wgUser->getEmailAuthenticationTimestamp(), true ); |
| | 566 | + $d = $wgLang->date( $wgUser->getEmailAuthenticationTimestamp(), true ); |
| | 567 | + $t = $wgLang->time( $wgUser->getEmailAuthenticationTimestamp(), true ); |
| | 568 | + $emailauthenticated = wfMsg('emailauthenticated', $time, $d, $t ).'<br />'; |
| 563 | 569 | $disableEmailPrefs = false; |
| 564 | 570 | } else { |
| 565 | 571 | $disableEmailPrefs = true; |
| — | — | @@ -618,7 +624,7 @@ |
| 619 | 625 | $toolLinks = array(); |
| 620 | 626 | $toolLinks[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'ListGroupRights' ), wfMsg( 'listgrouprights' ) ); |
| 621 | 627 | # At the moment one tool link only but be prepared for the future... |
| 622 | | - # FIXME: Add a link to Special:Userrights for users who are allowed to use it. |
| | 628 | + # FIXME: Add a link to Special:Userrights for users who are allowed to use it. |
| 623 | 629 | # $wgUser->isAllowed( 'userrights' ) seems to strict in some cases |
| 624 | 630 | |
| 625 | 631 | $userInformationHtml = |
| — | — | @@ -627,7 +633,7 @@ |
| 628 | 634 | |
| 629 | 635 | $this->tableRow( |
| 630 | 636 | wfMsgExt( 'prefs-memberingroups', array( 'parseinline' ), count( $userEffectiveGroupsArray ) ), |
| 631 | | - implode( wfMsg( 'comma-separator' ), $userEffectiveGroupsArray ) . |
| | 637 | + implode( wfMsg( 'comma-separator' ), $userEffectiveGroupsArray ) . |
| 632 | 638 | '<br />(' . implode( ' | ', $toolLinks ) . ')' |
| 633 | 639 | ) . |
| 634 | 640 | |
| — | — | @@ -732,7 +738,7 @@ |
| 733 | 739 | ) |
| 734 | 740 | ); |
| 735 | 741 | } |
| 736 | | - |
| | 742 | + |
| 737 | 743 | if(count($variantArray) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion) { |
| 738 | 744 | $wgOut->addHtml( |
| 739 | 745 | Xml::tags( 'tr', null, |
| Index: trunk/phase3/includes/specials/SpecialConfirmemail.php |
| — | — | @@ -58,8 +58,13 @@ |
| 59 | 59 | } |
| 60 | 60 | } else { |
| 61 | 61 | if( $wgUser->isEmailConfirmed() ) { |
| | 62 | + // date and time are separate parameters to facilitate localisation. |
| | 63 | + // $time is kept for backward compat reasons. |
| | 64 | + // 'emailauthenticated' is also used in SpecialPreferences.php |
| 62 | 65 | $time = $wgLang->timeAndDate( $wgUser->mEmailAuthenticated, true ); |
| 63 | | - $wgOut->addWikiMsg( 'emailauthenticated', $time ); |
| | 66 | + $d = $wgLang->date( $wgUser->mEmailAuthenticated, true ); |
| | 67 | + $t = $wgLang->time( $wgUser->mEmailAuthenticated, true ); |
| | 68 | + $wgOut->addWikiMsg( 'emailauthenticated', $time, $d, $t ); |
| 64 | 69 | } |
| 65 | 70 | if( $wgUser->isEmailConfirmationPending() ) { |
| 66 | 71 | $wgOut->addWikiMsg( 'confirmemail_pending' ); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -963,7 +963,7 @@ |
| 964 | 964 | 'mailerror' => 'Error sending mail: $1', |
| 965 | 965 | 'acct_creation_throttle_hit' => 'Sorry, you have already created {{PLURAL:$1|1 account|$1 accounts}}. |
| 966 | 966 | You cannot make any more.', |
| 967 | | -'emailauthenticated' => 'Your e-mail address was authenticated on $1.', |
| | 967 | +'emailauthenticated' => 'Your e-mail address was authenticated on $2 at $3.', |
| 968 | 968 | 'emailnotauthenticated' => 'Your e-mail address is not yet authenticated. |
| 969 | 969 | No e-mail will be sent for any of the following features.', |
| 970 | 970 | 'noemailprefs' => 'Specify an e-mail address for these features to work.', |
| — | — | @@ -2364,7 +2364,7 @@ |
| 2365 | 2365 | 'undeletehistorynoadmin' => 'This page has been deleted. |
| 2366 | 2366 | The reason for deletion is shown in the summary below, along with details of the users who had edited this page before deletion. |
| 2367 | 2367 | The actual text of these deleted revisions is only available to administrators.', |
| 2368 | | -'undelete-revision' => 'Deleted revision of $1 (as of $2) by $3:', |
| | 2368 | +'undelete-revision' => 'Deleted revision of $1 (as of $5 on $4) by $3:', |
| 2369 | 2369 | 'undeleterevision-missing' => 'Invalid or missing revision. |
| 2370 | 2370 | You may have a bad link, or the revision may have been restored or removed from the archive.', |
| 2371 | 2371 | 'undelete-nodiff' => 'No previous revision found.', |