jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated wfMsg* and inelegant HTML
......................................................................
Replace deprecated wfMsg* and inelegant HTML
- Replaces wfMsg* calls
- Use Html class instead of parser
Bug: T70750
Change-Id: I86667acb284b239b66bdbec3a87007f5ff11deec
---
M Duplicator.page.php
M Duplicator.php
2 files changed, 52 insertions(+), 21 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Duplicator.page.php b/Duplicator.page.php
index 424d944..b6bc372 100644
--- a/Duplicator.page.php
+++ b/Duplicator.page.php
@@ -112,8 +112,16 @@
# Attempt to perform the main duplicate op. first
$num = $this->duplicate( $this->sourceTitle, $this->destTitle,
$this->history );
if( $num ) {
- $success = '* ' . wfMsgNoTrans( 'duplicator-success',
$this->sourceTitle->getPrefixedText(), $this->destTitle->getPrefixedText() );
- $success .= ' ' . wfMsgNoTrans(
'duplicator-success-revisions', $wgLang->formatNum( $num ) ) . "\n";
+ $success = Html::openElement( 'ul' ) .
+ Html::element( 'li',
+ array(),
+ $this->msg( 'duplicator-success',
+
$this->sourceTitle->getPrefixedText(),
+
$this->destTitle->getPrefixedText()
+ )->plain() . ' ' .
+ $this->msg(
'duplicator-success-revisions' )->numParams( $num )->plain()
+ );
+
# If there are subpages and we've been asked to
duplicate them, do so
if ( $this->subpages ) {
$success .= $this->duplicateSubpages(
$this->sourceTitle, $this->destTitle, $this->history );
@@ -124,18 +132,26 @@
$dt = $this->destTitle->getTalkPage();
$num = $this->duplicate( $st, $dt,
$this->history );
if ( $num ) {
- $success .= '* ' . wfMsgNoTrans(
'duplicator-success', $st->getPrefixedText(), $dt->getPrefixedText() );
- $success .= ' ' . wfMsgNoTrans(
'duplicator-success-revisions', $wgLang->formatNum( $num ) ) . "\n";
+ $success .= Html::element( 'li',
+ array(),
+ $this->msg(
'duplicator-success',
+ $st->getPrefixedText(),
+ $dt->getPrefixedText()
+ )->plain() . ' ' .
+ $this->msg(
'duplicator-success-revisions' )->numParams( $num )->plain()
+ );
+
if ( $this->subpages ) {
$success .=
$this->duplicateSubpages( $st, $dt, $this->history );
}
} else {
- $success .= '* ' . wfMsgNoTrans(
'duplicator-success-talknotcopied' ) . "\n";
+ $success .= Html::element( 'li',
array(), $this->msg( 'duplicator-success-talknotcopied' )->plain() );
}
}
- # Report success to the user
- $parsed = $wgOut->parse( $success, /*linestart*/true,
/*uilang*/true );
- $wgOut->addHTML( $parsed );
+
+ $success .= Html::closeElement( 'ul' );
+ $wgOut->addHTML( $success );
+
} else {
# Something went wrong, abort the entire operation
$wgOut->addWikiMsg( 'duplicator-failed' );
@@ -189,27 +205,28 @@
$self = SpecialPage::getTitleFor( 'Duplicator' );
$source = is_object( $this->sourceTitle ) ?
$this->sourceTitle->getPrefixedText() : $this->source;
$dest = is_object( $this->destTitle ) ?
$this->destTitle->getPrefixedText() : $this->dest;
+ // FIXME: replace this to use Html or/and Xml class to generate
HTML
$form = '<form method="post" action="' . $self->getLocalUrl()
. '">';
- $form .= '<fieldset><legend>' . wfMsgHtml( 'duplicator-options'
) . '</legend>';
+ $form .= '<fieldset><legend>' . $this->msg(
'duplicator-options' )->escaped() . '</legend>';
$form .= '<table>';
$form .= '<tr>';
- $form .= '<td><label for="source">' . wfMsgHtml(
'duplicator-source' ) . '</label></td>';
+ $form .= '<td><label for="source">' . $this->msg(
'duplicator-source' )->escaped() . '</label></td>';
$form .= '<td>' . Xml::input( 'source', 40, $source, array(
'id' => 'source' ) ) . '</td>';
$form .= '</tr><tr>';
- $form .= '<td><label for="dest">' . wfMsgHtml(
'duplicator-dest' ) . '</label></td>';
+ $form .= '<td><label for="dest">' . $this->msg(
'duplicator-dest' )->escaped() . '</label></td>';
$form .= '<td>' . Xml::input( 'dest', 40, $dest, array( 'id' =>
'dest' ) ) . '</td>';
$form .= '</tr><tr>';
$form .= '<td> </td>';
- $form .= '<td>' . Xml::checkLabel( wfMsg( 'duplicator-dotalk'
), 'talk', 'talk', $this->talk ) . '</td>';
+ $form .= '<td>' . Xml::checkLabel( $this->msg(
'duplicator-dotalk' )->text(), 'talk', 'talk', $this->talk ) . '</td>';
$form .= '</tr><tr>';
$form .= '<td> </td>';
- $form .= '<td>' . Xml::checkLabel( wfMsg(
'duplicator-dosubpages' ), 'subpages', 'subpages', $this->subpages ) . '</td>';
+ $form .= '<td>' . Xml::checkLabel( $this->msg(
'duplicator-dosubpages' )->text(), 'subpages', 'subpages', $this->subpages ) .
'</td>';
$form .= '</tr><tr>';
$form .= '<td> </td>';
- $form .= '<td>' . Xml::checkLabel( wfMsg(
'duplicator-dohistory' ), 'history', 'history', $this->history ) . '</td>';
+ $form .= '<td>' . Xml::checkLabel( $this->msg(
'duplicator-dohistory' )->text(), 'history', 'history', $this->history ) .
'</td>';
$form .= '</tr><tr>';
$form .= '<td> </td>';
- $form .= '<td>' . Xml::submitButton( wfMsg( 'duplicator-submit'
) ) . '</td>';
+ $form .= '<td>' . Xml::submitButton( $this->msg(
'duplicator-submit' )->escaped() ) . '</td>';
$form .= '</tr>';
$form .= '</table>';
$form .= Html::Hidden( 'token', $wgUser->getEditToken(
'duplicator' ) );
@@ -235,15 +252,29 @@
$destSub = Title::makeTitleSafe( $ns, $dest . substr(
$sub->getText(), $len ) );
if ( $destSub ) {
if ( $destSub->exists() ) {
- $success .= '* ' . wfMsgNoTrans(
'duplicator-failed-dest-exists', $sub->getPrefixedText(),
$destSub->getPrefixedText() ) . "\n";
+ $success .= Html::element( 'li',
+ array(),
+ $this->msg(
'duplicator-failed-dest-exists',
+ $sub->getPrefixedText(),
+
$destSub->getPrefixedText()
+ )->plain()
+ );
} else {
$num = $this->duplicate( $sub,
$destSub, $this->history );
- $success .= '* ' . wfMsgNoTrans(
'duplicator-success', $sub->getPrefixedText(), $destSub->getPrefixedText() );
- $success .= ' ' . wfMsgNoTrans(
'duplicator-success-revisions', $wgLang->formatNum( $num ) ) . "\n";
+ $success .= Html::element( 'li',
+ array(),
+ $this->msg(
'duplicator-success',
+ $sub->getPrefixedText(),
+
$destSub->getPrefixedText()
+ )->plain() . ' ' .
+ $this->msg(
'duplicator-success-revisions',
+ $wgLang->formatNum(
$num )
+ )->plain()
+ );
}
} else {
# Bad title error can only occur here because
of the destination title being too long
- $success .= '* ' . wfMsgNoTrans(
'duplicator-failed-toolong', $sub->getPrefixedText() ) . "\n";
+ $success .= Html::element( 'li', array(),
$this->msg( 'duplicator-failed-toolong', $sub->getPrefixedText() )->plain() );
}
}
return $success;
@@ -280,7 +311,7 @@
if( $res && ( $count = $dbw->numRows( $res ) ) > 0 ) {
while( $row = $dbw->fetchObject( $res ) ) {
if( !$comment ) {
- $comment = wfMsgForContent(
'duplicator-summary', $source->getPrefixedText(), $row->rev_id );
+ $comment = $this->msg(
'duplicator-summary', $source->getPrefixedText(), $row->rev_id
)->inContentLanguage()->text();
}
$values['rev_page'] = $aid;
$values['rev_text_id'] = $row->rev_text_id;
diff --git a/Duplicator.php b/Duplicator.php
index 5f9706d..3cde41a 100644
--- a/Duplicator.php
+++ b/Duplicator.php
@@ -64,7 +64,7 @@
if( ( $ns === NS_MAIN || $ns === NS_TALK ) && $wgUser->isAllowed(
'duplicate' ) ) {
$nav_urls['duplicator'] = array(
- 'text' => wfMsg( 'duplicator-toolbox' ),
+ 'text' => $skin->msg( 'duplicator-toolbox' ),
'href' => $skin->makeSpecialUrl( 'Duplicator',
"source=" . wfUrlEncode( "{$skin->thispage}" ) )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/181794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86667acb284b239b66bdbec3a87007f5ff11deec
Gerrit-PatchSet: 19
Gerrit-Project: mediawiki/extensions/Duplicator
Gerrit-Branch: master
Gerrit-Owner: Sn1per <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: tosfos <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
