Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185641
Change subject: Use Context on ProtectionForm for messages
......................................................................
Use Context on ProtectionForm for messages
Also use Language::userTimeAndDate instead of Language::timeAndDate,
avois using $wgUser for the timezone.
Change-Id: I3547bdc2ee2b787bcb301c4023512e31bc18b67f
---
M includes/ProtectionForm.php
1 file changed, 29 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/41/185641/1
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index 76ad252..aea3f43 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -209,11 +209,11 @@
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' )->text() );
// Show the log in case protection was possible once
$this->showLogExtract( $out );
@@ -240,12 +240,12 @@
# 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 @@
$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 @@
* @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 @@
}
$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 @@
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 .= "<tr><td>" .
Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, $msg->exists() ?
$msg->text() : $action ) .
@@ -375,23 +376,23 @@
"<tr><td>" . $this->buildSelector( $action,
$selected ) . "</td></tr><tr><td>";
$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 @@
}
$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 @@
<td></td>
<td class="mw-input">' .
Xml::checkLabel(
- wfMessage(
'protect-cascade' )->text(),
+ $context->msg(
'protect-cascade' )->text(),
'mwProtect-cascade',
'mwProtect-cascade',
$this->mCascade,
$this->disabledAttrib
@@ -477,12 +478,12 @@
# 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 @@
<tr>
<td></td>
<td class='mw-input'>" .
- Xml::checkLabel( wfMessage(
'watchthis' )->text(),
+ Xml::checkLabel( $context->msg(
'watchthis' )->text(),
'mwProtectWatch',
'mwProtectWatch',
$user->isWatched(
$this->mTitle ) || $user->getOption( 'watchdefault' ) ) .
"</td>
@@ -532,7 +533,7 @@
<td></td>
<td class='mw-submit'>" .
Xml::submitButton(
- wfMessage( 'confirm'
)->text(),
+ $context->msg(
'confirm' )->text(),
array( 'id' =>
'mw-Protect-submit' )
) .
"</td>
@@ -545,7 +546,7 @@
$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 @@
*/
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();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/185641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3547bdc2ee2b787bcb301c4023512e31bc18b67f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
