| Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php |
| — | — | @@ -510,7 +510,7 @@ |
| 511 | 511 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 512 | 512 | // Countries |
| 513 | 513 | $htmlOut .= Xml::openElement( 'tr' ); |
| 514 | | - $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsgHtml( 'centralnotice-geotargeted' ), 'geotargeted' ) ); |
| | 514 | + $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsg( 'centralnotice-geotargeted' ), 'geotargeted' ) ); |
| 515 | 515 | $htmlOut .= Xml::tags( 'td', array(), Xml::check( 'geotargeted', false, wfArrayMerge( $readonly, array( 'value' => 1, 'id' => 'geotargeted' ) ) ) ); |
| 516 | 516 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 517 | 517 | $htmlOut .= Xml::openElement( 'tr', array( 'id'=>'geoMultiSelector', 'style'=>'display:none;' ) ); |
| — | — | @@ -829,7 +829,7 @@ |
| 830 | 830 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 831 | 831 | // Countries |
| 832 | 832 | $htmlOut .= Xml::openElement( 'tr' ); |
| 833 | | - $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsgHtml( 'centralnotice-geotargeted' ), 'geotargeted' ) ); |
| | 833 | + $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsg( 'centralnotice-geotargeted' ), 'geotargeted' ) ); |
| 834 | 834 | $htmlOut .= Xml::tags( 'td', array(), Xml::check( 'geotargeted', $isGeotargeted, wfArrayMerge( $readonly, array( 'value' => $row->not_name, 'id' => 'geotargeted' ) ) ) ); |
| 835 | 835 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 836 | 836 | if ( $isGeotargeted ) { |
| — | — | @@ -842,23 +842,23 @@ |
| 843 | 843 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 844 | 844 | // Enabled |
| 845 | 845 | $htmlOut .= Xml::openElement( 'tr' ); |
| 846 | | - $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsgHtml( 'centralnotice-enabled' ), 'enabled' ) ); |
| | 846 | + $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsg( 'centralnotice-enabled' ), 'enabled' ) ); |
| 847 | 847 | $htmlOut .= Xml::tags( 'td', array(), Xml::check( 'enabled', $isEnabled, wfArrayMerge( $readonly, array( 'value' => $row->not_name, 'id' => 'enabled' ) ) ) ); |
| 848 | 848 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 849 | 849 | // Preferred |
| 850 | 850 | $htmlOut .= Xml::openElement( 'tr' ); |
| 851 | | - $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsgHtml( 'centralnotice-preferred' ), 'preferred' ) ); |
| | 851 | + $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsg( 'centralnotice-preferred' ), 'preferred' ) ); |
| 852 | 852 | $htmlOut .= Xml::tags( 'td', array(), Xml::check( 'preferred', $isPreferred, wfArrayMerge( $readonly, array( 'value' => $row->not_name, 'id' => 'preferred' ) ) ) ); |
| 853 | 853 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 854 | 854 | // Locked |
| 855 | 855 | $htmlOut .= Xml::openElement( 'tr' ); |
| 856 | | - $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsgHtml( 'centralnotice-locked' ), 'locked' ) ); |
| | 856 | + $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsg( 'centralnotice-locked' ), 'locked' ) ); |
| 857 | 857 | $htmlOut .= Xml::tags( 'td', array(), Xml::check( 'locked', $isLocked, wfArrayMerge( $readonly, array( 'value' => $row->not_name, 'id' => 'locked' ) ) ) ); |
| 858 | 858 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 859 | 859 | if ( $this->editable ) { |
| 860 | 860 | // Locked |
| 861 | 861 | $htmlOut .= Xml::openElement( 'tr' ); |
| 862 | | - $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsgHtml( 'centralnotice-remove' ), 'remove' ) ); |
| | 862 | + $htmlOut .= Xml::tags( 'td', array(), Xml::label( wfMsg( 'centralnotice-remove' ), 'remove' ) ); |
| 863 | 863 | $htmlOut .= Xml::tags( 'td', array(), Xml::check( 'remove', false, array( 'value' => $row->not_name, 'id' => 'remove' ) ) ); |
| 864 | 864 | $htmlOut .= Xml::closeElement( 'tr' ); |
| 865 | 865 | } |