| Index: trunk/extensions/Interwiki/Interwiki_body.php |
| — | — | @@ -95,8 +95,8 @@ |
| 96 | 96 | $input = array( 'class' => 'mw-input' ); |
| 97 | 97 | |
| 98 | 98 | if( $action == 'delete' ) { |
| 99 | | - $topmessage = wfMessage( 'interwiki_delquestion', $prefix )->parse(); |
| 100 | | - $intromessage = wfMessage( 'interwiki_deleting', $prefix )->parse(); |
| | 99 | + $topmessage = wfMessage( 'interwiki_delquestion', $prefix )->text(); |
| | 100 | + $intromessage = wfMessage( 'interwiki_deleting', $prefix )->text(); |
| 101 | 101 | $wpPrefix = Html::hidden( 'wpInterwikiPrefix', $prefix ); |
| 102 | 102 | $button = 'delete'; |
| 103 | 103 | $formContent = ''; |
| — | — | @@ -112,8 +112,8 @@ |
| 113 | 113 | $trans = $row->iw_trans; |
| 114 | 114 | $local = $row->iw_local; |
| 115 | 115 | $wpPrefix = Html::hidden( 'wpInterwikiPrefix', $row->iw_prefix ); |
| 116 | | - $topmessage = wfMessage( 'interwiki_edittext' )->parse(); |
| 117 | | - $intromessage = wfMessage( 'interwiki_editintro' )->parse(); |
| | 116 | + $topmessage = wfMessage( 'interwiki_edittext' )->text(); |
| | 117 | + $intromessage = wfMessage( 'interwiki_editintro' )->text(); |
| 118 | 118 | $button = 'edit'; |
| 119 | 119 | } elseif( $action == 'add' ) { |
| 120 | 120 | $prefix = $wgRequest->getVal( 'wpInterwikiPrefix' ) ? |
| — | — | @@ -123,24 +123,24 @@ |
| 124 | 124 | $local = $wgRequest->getCheck( 'wpInterwikiLocal' ); |
| 125 | 125 | $trans = $wgRequest->getCheck( 'wpInterwikiTrans' ); |
| 126 | 126 | $defaulturl = $wgRequest->getVal( 'wpInterwikiURL' ) ? |
| 127 | | - $wgRequest->getVal( 'wpInterwikiURL' ) : wfMessage( 'interwiki-defaulturl' ); |
| 128 | | - $topmessage = wfMessage( 'interwiki_addtext' )->parse(); |
| 129 | | - $intromessage = wfMessage( 'interwiki_addintro' )->parse(); |
| | 127 | + $wgRequest->getVal( 'wpInterwikiURL' ) : wfMessage( 'interwiki-defaulturl' )->text(); |
| | 128 | + $topmessage = wfMessage( 'interwiki_addtext' )->text(); |
| | 129 | + $intromessage = wfMessage( 'interwiki_addintro' )->text(); |
| 130 | 130 | $button = 'interwiki_addbutton'; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | if( $action == 'add' || $action == 'edit' ) { |
| 134 | 134 | $formContent = Html::rawElement( 'tr', null, |
| 135 | | - Html::element( 'td', $label, wfMessage( 'interwiki-prefix-label' ) ) . |
| | 135 | + Html::element( 'td', $label, wfMessage( 'interwiki-prefix-label' )->text() ) . |
| 136 | 136 | Html::rawElement( 'td', null, '<tt>' . $prefix . '</tt>' ) |
| 137 | 137 | ) . Html::rawElement( 'tr', null, |
| 138 | | - Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki-local-label' ), 'mw-interwiki-local' ) ) . |
| | 138 | + Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki-local-label' )->text(), 'mw-interwiki-local' ) ) . |
| 139 | 139 | Html::rawElement( 'td', $input, Xml::check( 'wpInterwikiLocal', $local, array( 'id' => 'mw-interwiki-local' ) ) ) |
| 140 | 140 | ) . Html::rawElement( 'tr', null, |
| 141 | | - Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki-trans-label' ), 'mw-interwiki-trans' ) ) . |
| | 141 | + Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki-trans-label' )->text(), 'mw-interwiki-trans' ) ) . |
| 142 | 142 | Html::rawElement( 'td', $input, Xml::check( 'wpInterwikiTrans', $trans, array( 'id' => 'mw-interwiki-trans' ) ) ) |
| 143 | 143 | ) . Html::rawElement( 'tr', null, |
| 144 | | - Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki-url-label' ), 'mw-interwiki-url' ) ) . |
| | 144 | + Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki-url-label' )->text(), 'mw-interwiki-url' ) ) . |
| 145 | 145 | Html::rawElement( 'td', $input, Xml::input( 'wpInterwikiURL', 60, $defaulturl, |
| 146 | 146 | array( 'tabindex' => 1, 'maxlength' => 200, 'id' => 'mw-interwiki-url' ) ) ) |
| 147 | 147 | ); |
| — | — | @@ -152,7 +152,7 @@ |
| 153 | 153 | Html::rawElement( 'p', null, $intromessage ) . |
| 154 | 154 | Html::rawElement( 'table', array( 'id' => "mw-interwiki-{$action}" ), |
| 155 | 155 | $formContent . Html::rawElement( 'tr', null, |
| 156 | | - Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki_reasonfield' ), |
| | 156 | + Html::rawElement( 'td', $label, Xml::label( wfMessage( 'interwiki_reasonfield' )->text(), |
| 157 | 157 | "mw-interwiki-{$action}reason" ) ) . |
| 158 | 158 | Html::rawElement( 'td', $input, Xml::input( 'wpInterwikiReason', 60, '', |
| 159 | 159 | array( 'tabindex' => 1, 'id' => "mw-interwiki-{$action}reason", 'maxlength' => 200 ) ) ) |