From 82ad84d0badc0791c15d0bdb013619c67514bb57 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sat, 17 Jan 2015 21:04:39 +0100 Subject: [PATCH] Use Context on ProtectionForm for messages Also use Language::userTimeAndDate instead of Language::timeAndDate, avois using $wgUser for the timezone. Change-Id: I3547bdc2ee2b787bcb301c4023512e31bc18b67f --- includes/ProtectionForm.php | 57 +++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php index 76ad2528ad..4eae1ce428 100644 --- a/includes/ProtectionForm.php +++ b/includes/ProtectionForm.php @@ -209,11 +209,11 @@ class ProtectionForm { if ( $this->mTitle->getRestrictionTypes() === array() ) { // No restriction types available for the current title // this might happen if an extension alters the available types - $out->setPageTitle( wfMessage( + $out->setPageTitle( $this->mContext->msg( 'protect-norestrictiontypes-title', $this->mTitle->getPrefixedText() ) ); - $out->addWikiText( wfMessage( 'protect-norestrictiontypes-text' )->text() ); + $out->addWikiText( $this->mContext->msg( 'protect-norestrictiontypes-text' )->plain() ); // Show the log in case protection was possible once $this->showLogExtract( $out ); @@ -240,12 +240,12 @@ class ProtectionForm { # the protection settings at this time if ( $this->disabled ) { $out->setPageTitle( - wfMessage( 'protect-title-notallowed', + $this->mContext->msg( 'protect-title-notallowed', $this->mTitle->getPrefixedText() ) ); $out->addWikiText( $out->formatPermissionsErrorMessage( $this->mPermErrors, 'protect' ) ); } else { - $out->setPageTitle( wfMessage( 'protect-title', $this->mTitle->getPrefixedText() ) ); + $out->setPageTitle( $this->mContext->msg( 'protect-title', $this->mTitle->getPrefixedText() ) ); $out->addWikiMsg( 'protect-text', wfEscapeWikiText( $this->mTitle->getPrefixedText() ) ); } @@ -279,7 +279,7 @@ class ProtectionForm { $reasonstr = $this->mReasonSelection; if ( $reasonstr != 'other' && $this->mReason != '' ) { // Entry from drop down menu + additional comment - $reasonstr .= wfMessage( 'colon-separator' )->text() . $this->mReason; + $reasonstr .= $this->mContext->msg( 'colon-separator' )->text() . $this->mReason; } elseif ( $reasonstr == 'other' ) { $reasonstr = $this->mReason; } @@ -342,10 +342,11 @@ class ProtectionForm { * @return string HTML form */ function buildForm() { - $user = $this->mContext->getUser(); - $output = $this->mContext->getOutput(); - $lang = $this->mContext->getLanguage(); - $cascadingRestrictionLevels = $this->mContext->getConfig()->get( 'CascadingRestrictionLevels' ); + $context = $this->mContext; + $user = $context->getUser(); + $output = $context->getOutput(); + $lang = $context->getLanguage(); + $cascadingRestrictionLevels = $context->getConfig()->get( 'CascadingRestrictionLevels' ); $out = ''; if ( !$this->disabled ) { $output->addModules( 'mediawiki.legacy.protect' ); @@ -356,7 +357,7 @@ class ProtectionForm { } $out .= Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', null, wfMessage( 'protect-legend' )->text() ) . + Xml::element( 'legend', null, $context->msg( 'protect-legend' )->text() ) . Xml::openElement( 'table', array( 'id' => 'mwProtectSet' ) ) . Xml::openElement( 'tbody' ); @@ -367,7 +368,7 @@ class ProtectionForm { foreach ( $this->mRestrictions as $action => $selected ) { // Messages: // restriction-edit, restriction-move, restriction-create, restriction-upload - $msg = wfMessage( 'restriction-' . $action ); + $msg = $context->msg( 'restriction-' . $action ); $out .= "" . Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, $msg->exists() ? $msg->text() : $action ) . @@ -375,23 +376,23 @@ class ProtectionForm { "" . $this->buildSelector( $action, $selected ) . ""; $mProtectexpiry = Xml::label( - wfMessage( 'protectexpiry' )->text(), + $context->msg( 'protectexpiry' )->text(), "mwProtectExpirySelection-$action" ); $mProtectother = Xml::label( - wfMessage( 'protect-othertime' )->text(), + $context->msg( 'protect-othertime' )->text(), "mwProtect-$action-expires" ); $expiryFormOptions = ''; if ( $this->mExistingExpiry[$action] ) { if ( $this->mExistingExpiry[$action] == 'infinity' ) { - $existingExpiryMessage = wfMessage( 'protect-existing-expiry-infinity' ); + $existingExpiryMessage = $context->msg( 'protect-existing-expiry-infinity' ); } else { - $timestamp = $lang->timeanddate( $this->mExistingExpiry[$action], true ); - $d = $lang->date( $this->mExistingExpiry[$action], true ); - $t = $lang->time( $this->mExistingExpiry[$action], true ); - $existingExpiryMessage = wfMessage( 'protect-existing-expiry', $timestamp, $d, $t ); + $timestamp = $lang->userTimeAndDate( $this->mExistingExpiry[$action], $user ); + $d = $lang->userDate( $this->mExistingExpiry[$action], $user ); + $t = $lang->userTime( $this->mExistingExpiry[$action], $user ); + $existingExpiryMessage = $context->msg( 'protect-existing-expiry', $timestamp, $d, $t ); } $expiryFormOptions .= Xml::option( @@ -402,7 +403,7 @@ class ProtectionForm { } $expiryFormOptions .= Xml::option( - wfMessage( 'protect-othertime-op' )->text(), + $context->msg( 'protect-othertime-op' )->text(), "othertime" ) . "\n"; foreach ( explode( ',', $scExpiryOptions ) as $option ) { @@ -464,7 +465,7 @@ class ProtectionForm { ' . Xml::checkLabel( - wfMessage( 'protect-cascade' )->text(), + $context->msg( 'protect-cascade' )->text(), 'mwProtect-cascade', 'mwProtect-cascade', $this->mCascade, $this->disabledAttrib @@ -477,12 +478,12 @@ class ProtectionForm { # Add manual and custom reason field/selects as well as submit if ( !$this->disabled ) { $mProtectreasonother = Xml::label( - wfMessage( 'protectcomment' )->text(), + $context->msg( 'protectcomment' )->text(), 'wpProtectReasonSelection' ); $mProtectreason = Xml::label( - wfMessage( 'protect-otherreason' )->text(), + $context->msg( 'protect-otherreason' )->text(), 'mwProtect-reason' ); @@ -521,7 +522,7 @@ class ProtectionForm { " . - Xml::checkLabel( wfMessage( 'watchthis' )->text(), + Xml::checkLabel( $context->msg( 'watchthis' )->text(), 'mwProtectWatch', 'mwProtectWatch', $user->isWatched( $this->mTitle ) || $user->getOption( 'watchdefault' ) ) . " @@ -532,7 +533,7 @@ class ProtectionForm { " . Xml::submitButton( - wfMessage( 'confirm' )->text(), + $context->msg( 'confirm' )->text(), array( 'id' => 'mw-Protect-submit' ) ) . " @@ -545,7 +546,7 @@ class ProtectionForm { $title = Title::makeTitle( NS_MEDIAWIKI, 'Protect-dropdown' ); $link = Linker::link( $title, - wfMessage( 'protect-edit-reasonlist' )->escaped(), + $context->msg( 'protect-edit-reasonlist' )->escaped(), array(), array( 'action' => 'edit' ) ); @@ -600,14 +601,14 @@ class ProtectionForm { */ private function getOptionLabel( $permission ) { if ( $permission == '' ) { - return wfMessage( 'protect-default' )->text(); + return $this->mContext->msg( 'protect-default' )->text(); } else { // Messages: protect-level-autoconfirmed, protect-level-sysop - $msg = wfMessage( "protect-level-{$permission}" ); + $msg = $this->mContext->msg( "protect-level-{$permission}" ); if ( $msg->exists() ) { return $msg->text(); } - return wfMessage( 'protect-fallback', $permission )->text(); + return $this->mContext->msg( 'protect-fallback', $permission )->text(); } } -- 2.20.1