From bb91f74ad29393e2414054893aba788c055e12d8 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Mon, 19 Dec 2011 18:19:03 +0000 Subject: [PATCH] * Use Language::userTimeAndDate() and related instead of Language::timeanddate() when using user preferences to display dates * Use local variables instead of calling some methods three times * Fixed casing of remaining Language::timeanddate() call --- includes/Preferences.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/includes/Preferences.php b/includes/Preferences.php index c77e9eabb8..323ef68e45 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -193,14 +193,16 @@ class Preferences { ); if ( $user->getRegistration() ) { + $displayUser = $context->getUser(); + $userRegistration = $user->getRegistration(); $defaultPreferences['registrationdate'] = array( 'type' => 'info', 'label-message' => 'prefs-registration', 'default' => $context->msg( 'prefs-registration-date-time', - $lang->timeanddate( $user->getRegistration(), true ), - $lang->date( $user->getRegistration(), true ), - $lang->time( $user->getRegistration(), true ) + $lang->userTimeAndDate( $userRegistration, $displayUser ), + $lang->userDate( $userRegistration, $displayUser ), + $lang->userTime( $userRegistration, $displayUser ) )->parse(), 'section' => 'personal/info', ); @@ -368,9 +370,11 @@ class Preferences { // date and time are separate parameters to facilitate localisation. // $time is kept for backward compat reasons. // 'emailauthenticated' is also used in SpecialConfirmemail.php - $time = $lang->timeAndDate( $user->getEmailAuthenticationTimestamp(), true ); - $d = $lang->date( $user->getEmailAuthenticationTimestamp(), true ); - $t = $lang->time( $user->getEmailAuthenticationTimestamp(), true ); + $displayUser = $context->getUser(); + $emailTimestamp = $user->getEmailAuthenticationTimestamp(); + $time = $lang->userTimeAndDate( $emailTimestamp, $displayUser ); + $d = $lang->userDate( $emailTimestamp, $displayUser ); + $t = $lang->userTime( $emailTimestamp, $displayUser ); $emailauthenticated = $context->msg( 'emailauthenticated', $time, $d, $t )->parse() . '
'; $disableEmailPrefs = false; @@ -1094,7 +1098,8 @@ class Preferences { * @return array */ static function getDateOptions( IContextSource $context ) { - $dateopts = $context->getLanguage()->getDatePreferences(); + $lang = $context->getLanguage(); + $dateopts = $lang->getDatePreferences(); $ret = array(); @@ -1115,7 +1120,7 @@ class Preferences { if ( $key == 'default' ) { $formatted = $context->msg( 'datedefault' )->escaped(); } else { - $formatted = htmlspecialchars( $context->getLanguage()->timeanddate( $epoch, false, $key ) ); + $formatted = htmlspecialchars( $lang->timeanddate( $epoch, false, $key ) ); } $ret[$formatted] = $key; } -- 2.20.1