| Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php |
| — | — | @@ -186,7 +186,7 @@ |
| 187 | 187 | $project_name = $wgRequest->getVal( 'project_name' ); |
| 188 | 188 | $project_language = $wgRequest->getVal( 'wpUserLanguage' ); |
| 189 | 189 | if ( $noticeName == '' ) { |
| 190 | | - $wgOut->addHTML( wfMsg ( 'centralnotice-null-string' ) ); |
| | 190 | + $wgOut->addWikiwfMsg ( 'centralnotice-null-string' ); |
| 191 | 191 | } |
| 192 | 192 | else { |
| 193 | 193 | $this->addNotice( $noticeName, '0', $start, $project_name, $project_language ); |
| — | — | @@ -414,7 +414,7 @@ |
| 415 | 415 | ) |
| 416 | 416 | ); |
| 417 | 417 | } |
| 418 | | - $htmlOut .= Xml::fieldset( wfMsgHtml( "centralnotice-manage" ) ); |
| | 418 | + $htmlOut .= Xml::fieldset( wfMsg( "centralnotice-manage" ) ); |
| 419 | 419 | $htmlOut .= Xml::openElement( 'table', |
| 420 | 420 | array( |
| 421 | 421 | 'cellpadding' => 9, |
| — | — | @@ -503,7 +503,7 @@ |
| 504 | 504 | if ( $this->editable ) { |
| 505 | 505 | $htmlOut .= $this->tableRow( |
| 506 | 506 | array( |
| 507 | | - Xml::submitButton( wfMsgHtml( 'centralnotice-modify' ), |
| | 507 | + Xml::submitButton( wfMsg( 'centralnotice-modify' ), |
| 508 | 508 | array( |
| 509 | 509 | 'id' => 'centralnoticesubmit', |
| 510 | 510 | 'name' => 'centralnoticesubmit' |
| — | — | @@ -1034,7 +1034,7 @@ |
| 1035 | 1035 | $dbr = wfGetDB( DB_SLAVE ); |
| 1036 | 1036 | $res = $dbr->select( 'cn_notices', 'not_name', array( 'not_name' => $noticeName ) ); |
| 1037 | 1037 | if ( $dbr->numRows( $res ) > 0 ) { |
| 1038 | | - $wgOut->addHTML( wfMsg( 'centralnotice-notice-exists' ) ); |
| | 1038 | + $wgOut->addWikiMsg( 'centralnotice-notice-exists' ); |
| 1039 | 1039 | return; |
| 1040 | 1040 | } else { |
| 1041 | 1041 | $dbw = wfGetDB( DB_MASTER ); |
| — | — | @@ -1076,12 +1076,12 @@ |
| 1077 | 1077 | array( 'not_name' => $noticeName ) |
| 1078 | 1078 | ); |
| 1079 | 1079 | if ( $dbr->numRows( $res ) < 1 ) { |
| 1080 | | - $wgOut->addHTML( wfMsg( 'centralnotice-notice-doesnt-exist' ) ); |
| | 1080 | + $wgOut->addWikiMsg( 'centralnotice-notice-doesnt-exist' ); |
| 1081 | 1081 | return; |
| 1082 | 1082 | } |
| 1083 | 1083 | $row = $dbr->fetchObject( $res ); |
| 1084 | 1084 | if ( $row->not_locked == '1' ) { |
| 1085 | | - $wgOut->addHTML( wfMsg( 'centralnotice-notice-is-locked' ) ); |
| | 1085 | + $wgOut->addWikiMsg( 'centralnotice-notice-is-locked' ); |
| 1086 | 1086 | return; |
| 1087 | 1087 | } else { |
| 1088 | 1088 | $dbw = wfGetDB( DB_MASTER ); |
| — | — | @@ -1109,7 +1109,7 @@ |
| 1110 | 1110 | ) |
| 1111 | 1111 | ); |
| 1112 | 1112 | if ( $dbr->numRows( $res ) > 0 ) { |
| 1113 | | - $wgOut->addHTML( wfMsg( 'centralnotice-template-already-exists' ) ); |
| | 1113 | + $wgOut->addWikiMsg( 'centralnotice-template-already-exists' ); |
| 1114 | 1114 | } else { |
| 1115 | 1115 | $dbw = wfGetDB( DB_MASTER ); |
| 1116 | 1116 | $dbw->begin(); |
| — | — | @@ -1177,14 +1177,14 @@ |
| 1178 | 1178 | |
| 1179 | 1179 | // Start / end dont line up |
| 1180 | 1180 | if ( $start > $end || $end < $start ) { |
| 1181 | | - $wgOut->addHTML( wfMsg( 'centralnotice-invalid-date-range3' ) ); |
| | 1181 | + $wgOut->addWikiMsg( 'centralnotice-invalid-date-range3' ); |
| 1182 | 1182 | return; |
| 1183 | 1183 | } |
| 1184 | 1184 | |
| 1185 | 1185 | // Invalid notice name |
| 1186 | 1186 | $res = $dbr->select( 'cn_notices', 'not_name', array( 'not_name' => $noticeName ) ); |
| 1187 | 1187 | if ( $dbr->numRows( $res ) < 1 ) { |
| 1188 | | - $wgOut->addHTML( wfMsg( 'centralnotice-doesnt-exist' ) ); |
| | 1188 | + $wgOut->addWikiMsg( 'centralnotice-doesnt-exist' ); |
| 1189 | 1189 | } |
| 1190 | 1190 | |
| 1191 | 1191 | // Overlap over a date within the same project and language |
| — | — | @@ -1211,7 +1211,7 @@ |
| 1212 | 1212 | array( 'not_name' => $noticeName ) |
| 1213 | 1213 | ); |
| 1214 | 1214 | if ( $dbr->numRows( $res ) < 1 ) { |
| 1215 | | - $wgOut->addHTML( wfMsg( 'centralnotice-doesnt-exist' ) ); |
| | 1215 | + $wgOut->addWikiMsg( 'centralnotice-doesnt-exist' ); |
| 1216 | 1216 | } else { |
| 1217 | 1217 | $dbw = wfGetDB( DB_MASTER ); |
| 1218 | 1218 | $dbw->begin(); |
| Index: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php |
| — | — | @@ -373,7 +373,7 @@ |
| 374 | 374 | Xml::tags( 'td', null, $lsLabel ) . |
| 375 | 375 | Xml::tags( 'td', null, $lsSelect ) . |
| 376 | 376 | Xml::tags( 'td', array( 'colspan' => 2 ), |
| 377 | | - Xml::submitButton( wfMsgHtml( 'centralnotice-modify' ) ) |
| | 377 | + Xml::submitButton( wfMsg( 'centralnotice-modify' ) ) |
| 378 | 378 | ) |
| 379 | 379 | ); |
| 380 | 380 | $htmlOut .= Xml::tags( 'tr', null, |
| — | — | @@ -521,7 +521,7 @@ |
| 522 | 522 | // FIXME: weak comparison |
| 523 | 523 | if ( $name == '' ) { |
| 524 | 524 | // FIXME: message not defined? |
| 525 | | - $wgOut->addHTML( wfMsg( 'centralnotice-template-doesnt-exist' ) ); |
| | 525 | + $wgOut->addWikiMsg( 'centralnotice-template-doesnt-exist' ); |
| 526 | 526 | return; |
| 527 | 527 | } |
| 528 | 528 | |