| Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php |
| — | — | @@ -1330,8 +1330,7 @@ |
| 1331 | 1331 | * @return multiple select list |
| 1332 | 1332 | */ |
| 1333 | 1333 | function languageMultiSelector( $selected = array(), $customisedOnly = true ) { |
| 1334 | | - global $wgContLanguageCode; |
| 1335 | | - global $wgScriptPath; |
| | 1334 | + global $wgContLanguageCode, $wgScriptPath, $wgLang; |
| 1336 | 1335 | $scriptPath = "$wgScriptPath/extensions/CentralNotice"; |
| 1337 | 1336 | // Make sure the site language is in the list; a custom language code might not have a defined name... |
| 1338 | 1337 | $languages = Language::getLanguageNames( $customisedOnly ); |
| — | — | @@ -1360,7 +1359,7 @@ |
| 1361 | 1360 | $buttons[] = '<a href="#" onclick="top10Languages();return false;">' . wfMsg( 'centralnotice-top-ten-languages' ) . '</a>'; |
| 1362 | 1361 | $htmlOut .= Xml::tags( 'div', |
| 1363 | 1362 | array( 'style' => 'margin-top: 0.2em;' ), |
| 1364 | | - '<img src="'.$scriptPath.'/up-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-select', Language::commaList( $buttons ) ) |
| | 1363 | + '<img src="'.$scriptPath.'/up-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-select', $wgLang->commaList( $buttons ) ) |
| 1365 | 1364 | ); |
| 1366 | 1365 | } else { |
| 1367 | 1366 | $htmlOut .= Xml::tags( 'select', |
| Index: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php |
| — | — | @@ -182,7 +182,7 @@ |
| 183 | 183 | * Show "Add a banner" interface |
| 184 | 184 | */ |
| 185 | 185 | function showAdd() { |
| 186 | | - global $wgOut, $wgUser, $wgScriptPath; |
| | 186 | + global $wgOut, $wgUser, $wgScriptPath, $wgLang; |
| 187 | 187 | $scriptPath = "$wgScriptPath/extensions/CentralNotice"; |
| 188 | 188 | |
| 189 | 189 | // Build HTML |
| — | — | @@ -201,7 +201,7 @@ |
| 202 | 202 | $buttons[] = '<a href="#" onclick="insertButton(\'translate\');return false;">' . wfMsg( 'centralnotice-translate-button' ) . '</a>'; |
| 203 | 203 | $htmlOut .= Xml::tags( 'div', |
| 204 | 204 | array( 'style' => 'margin-bottom: 0.2em;' ), |
| 205 | | - '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert', Language::commaList( $buttons ) ) |
| | 205 | + '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert', $wgLang->commaList( $buttons ) ) |
| 206 | 206 | ); |
| 207 | 207 | $htmlOut .= Xml::textarea( 'templateBody', '', 60, 20 ); |
| 208 | 208 | $htmlOut .= Xml::closeElement( 'fieldset' ); |
| — | — | @@ -224,7 +224,7 @@ |
| 225 | 225 | * View or edit an individual banner |
| 226 | 226 | */ |
| 227 | 227 | private function showView() { |
| 228 | | - global $wgOut, $wgUser, $wgRequest, $wgContLanguageCode, $wgScriptPath; |
| | 228 | + global $wgOut, $wgUser, $wgRequest, $wgContLanguageCode, $wgScriptPath, $wgLang; |
| 229 | 229 | |
| 230 | 230 | $scriptPath = "$wgScriptPath/extensions/CentralNotice"; |
| 231 | 231 | $sk = $wgUser->getSkin(); |
| — | — | @@ -404,7 +404,7 @@ |
| 405 | 405 | $buttons[] = '<a href="#" onclick="insertButton(\'translate\');return false;">' . wfMsg( 'centralnotice-translate-button' ) . '</a>'; |
| 406 | 406 | $htmlOut .= Xml::tags( 'div', |
| 407 | 407 | array( 'style' => 'margin-bottom: 0.2em;' ), |
| 408 | | - '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert', Language::commaList( $buttons ) ) |
| | 408 | + '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert', $wgLang->commaList( $buttons ) ) |
| 409 | 409 | ); |
| 410 | 410 | $htmlOut .= Xml::textarea( 'templateBody', $body, 60, 20, $readonly ); |
| 411 | 411 | $htmlOut .= Xml::closeElement( 'fieldset' ); |