Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/55879
Change subject: (bug 43204) Activity log: time ignores user-timezone settings ...................................................................... (bug 43204) Activity log: time ignores user-timezone settings Change-Id: I87724bc2271c70ccfb7bfedf4a050b5ce1314bb3 --- M ArticleFeedbackv5.activity.php M ArticleFeedbackv5.render.php M api/ApiViewActivityArticleFeedbackv5.php 3 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/79/55879/1 diff --git a/ArticleFeedbackv5.activity.php b/ArticleFeedbackv5.activity.php index 7102aa4..1fe8218 100644 --- a/ArticleFeedbackv5.activity.php +++ b/ArticleFeedbackv5.activity.php @@ -1,4 +1,5 @@ <?php + /** * This class provides some functionality to easily get feedback's activity. * Because this data is less often requested & because we're dealing with diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php index 313ddae..956a515 100644 --- a/ArticleFeedbackv5.render.php +++ b/ArticleFeedbackv5.render.php @@ -887,8 +887,8 @@ ->params( $userText, SpecialPage::getTitleFor( 'ArticleFeedbackv5', "$title/$record->aft_id" ), - $wgLang->date( $record->aft_timestamp ), - $wgLang->time( $record->aft_timestamp ), + $wgLang->userDate( $record->aft_timestamp, $wgUser ), + $wgLang->userTime( $record->aft_timestamp, $wgUser ), SpecialPage::getTitleFor( 'ArticleFeedbackv5', $title ), Message::rawParam( Html::element( 'blockquote', array(), $record->aft_comment ) ), $record->getArticle()->getTitle() @@ -1086,7 +1086,7 @@ * @return string the rendered info section */ private function renderPermalinkInfo( $record ) { - global $wgLang; + global $wgLang, $wgUser; if ( !$this->isAllowed( 'aft-editor' ) ) { return ''; @@ -1110,7 +1110,7 @@ 'p', array(), wfMessage( 'articlefeedbackv5-permalink-info-posted' ) - ->params( $wgLang->date( $record->aft_timestamp ), $wgLang->time( $record->aft_timestamp ) ) + ->params( $wgLang->userDate( $record->aft_timestamp, $wgUser ), $wgLang->userTime( $record->aft_timestamp, $wgUser ) ) ->escaped() ) . Html::rawElement( diff --git a/api/ApiViewActivityArticleFeedbackv5.php b/api/ApiViewActivityArticleFeedbackv5.php index 3452bd4..bcffc37 100644 --- a/api/ApiViewActivityArticleFeedbackv5.php +++ b/api/ApiViewActivityArticleFeedbackv5.php @@ -89,7 +89,7 @@ Html::element( 'div', array(), - wfMessage( 'articlefeedbackv5-activity-feedback-date', array( $wgLang->timeanddate( $feedback->aft_timestamp ) ) )->text() + wfMessage( 'articlefeedbackv5-activity-feedback-date', array( $wgLang->userTimeAndDate( $feedback->aft_timestamp, $wgUser ) ) )->text() ) . Html::rawElement( 'div', @@ -156,9 +156,9 @@ ->rawParams( ArticleFeedbackv5Utils::getUserLink( $item->log_user, $item->log_user_text ), Linker::commentBlock( $item->log_comment ), - Html::element( 'span', array(), $wgLang->timeanddate( $item->log_timestamp ) ), - Html::element( 'span', array(), $wgLang->date( $item->log_timestamp ) ), - Html::element( 'span', array(), $wgLang->time( $item->log_timestamp ) ) + Html::element( 'span', array(), $wgLang->userTimeAndDate( $item->log_timestamp, $wgUser ) ), + Html::element( 'span', array(), $wgLang->userDate( $item->log_timestamp, $wgUser ) ), + Html::element( 'span', array(), $wgLang->userTime( $item->log_timestamp, $wgUser ) ) ) ->params( $item->log_user_text ) ->escaped() -- To view, visit https://gerrit.wikimedia.org/r/55879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I87724bc2271c70ccfb7bfedf4a050b5ce1314bb3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits