| Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php |
| — | — | @@ -757,7 +757,7 @@ |
| 758 | 758 | |
| 759 | 759 | if ( $row ) { |
| 760 | 760 | // Build Html |
| 761 | | - $htmlOut .= Xml::tags( 'h2', null, wfMsg( 'centralnotice-notice' ) . ': ' . $notice ); |
| | 761 | + $htmlOut .= Xml::tags( 'h2', null, wfMsg( 'centralnotice-notice-heading', $notice ) ); |
| 762 | 762 | $htmlOut .= Xml::openElement( 'table', array( 'cellpadding' => 9 ) ); |
| 763 | 763 | |
| 764 | 764 | // Rows |
| — | — | @@ -1348,7 +1348,7 @@ |
| 1349 | 1349 | ); |
| 1350 | 1350 | $htmlOut .= Xml::tags( 'div', |
| 1351 | 1351 | array( 'style' => 'margin-top: 0.2em;' ), |
| 1352 | | - '<img src="'.$scriptPath.'/up-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-select' ) . ': <a href="#" onclick="selectLanguages(true);return false;">' . wfMsg( 'powersearch-toggleall' ) . '</a>, <a href="#" onclick="selectLanguages(false);return false;">' . wfMsg( 'powersearch-togglenone' ) . '</a>, <a href="#" onclick="top10Languages();return false;">' . wfMsg( 'centralnotice-top-ten-languages' ) . '</a>' |
| | 1352 | + '<img src="'.$scriptPath.'/up-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-select' ) . ' <a href="#" onclick="selectLanguages(true);return false;">' . wfMsg( 'powersearch-toggleall' ) . '</a>, <a href="#" onclick="selectLanguages(false);return false;">' . wfMsg( 'powersearch-togglenone' ) . '</a>, <a href="#" onclick="top10Languages();return false;">' . wfMsg( 'centralnotice-top-ten-languages' ) . '</a>' |
| 1353 | 1353 | ); |
| 1354 | 1354 | } else { |
| 1355 | 1355 | $htmlOut .= Xml::tags( 'select', |
| Index: trunk/extensions/CentralNotice/CentralNotice.i18n.php |
| — | — | @@ -39,10 +39,12 @@ |
| 40 | 40 | 'centralnotice-english' => 'English', |
| 41 | 41 | 'centralnotice-banner-name' => 'Banner name', |
| 42 | 42 | 'centralnotice-banner' => 'Banner', |
| | 43 | + 'centralnotice-banner-heading' => 'Banner: $1', |
| 43 | 44 | 'centralnotice-templates' => 'Banners', |
| 44 | 45 | 'centralnotice-weight' => 'Weight', |
| 45 | 46 | 'centralnotice-locked' => 'Locked', |
| 46 | 47 | 'centralnotice-notice' => 'Campaign', |
| | 48 | + 'centralnotice-notice-heading' => 'Campaign: $1', |
| 47 | 49 | 'centralnotice-notices' => 'Campaigns', |
| 48 | 50 | 'centralnotice-notice-exists' => 'Campaign already exists. |
| 49 | 51 | Not adding.', |
| — | — | @@ -60,7 +62,7 @@ |
| 61 | 63 | 'centralnotice-hours' => 'Hour', |
| 62 | 64 | 'centralnotice-min' => 'Minute', |
| 63 | 65 | 'centralnotice-project-lang' => 'Project language', |
| 64 | | - 'centralnotice-select' => 'Select', |
| | 66 | + 'centralnotice-select' => 'Select: ', |
| 65 | 67 | 'centralnotice-top-ten-languages' => 'Top 10 languages', |
| 66 | 68 | 'centralnotice-project-name' => 'Project name', |
| 67 | 69 | 'centralnotice-start-date' => 'Start date', |
| — | — | @@ -97,9 +99,9 @@ |
| 98 | 100 | 'centralnotice-message-not-set' => 'Message not set', |
| 99 | 101 | 'centralnotice-clone' => 'Clone', |
| 100 | 102 | 'centralnotice-clone-notice' => 'Create a copy of the banner', |
| 101 | | - 'centralnotice-clone-name' => 'Name', |
| | 103 | + 'centralnotice-clone-name' => 'Name:', |
| 102 | 104 | 'centralnotice-preview-all-template-translations' => 'Preview all available translations of banner', |
| 103 | | - 'centralnotice-insert' => 'Insert', |
| | 105 | + 'centralnotice-insert' => 'Insert:', |
| 104 | 106 | 'centralnotice-hide-button' => 'Hide button', |
| 105 | 107 | 'centralnotice-collapse-button' => 'Collapse button', |
| 106 | 108 | 'centralnotice-expand-button' => 'Expand button', |
| Index: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php |
| — | — | @@ -198,7 +198,7 @@ |
| 199 | 199 | $htmlOut .= wfMsg( 'centralnotice-edit-template-summary' ); |
| 200 | 200 | $htmlOut .= Xml::tags( 'div', |
| 201 | 201 | array( 'style' => 'margin-bottom: 0.2em;' ), |
| 202 | | - '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert' ) . ': <a href="#" onclick="insertButton(\'hide\');return false;">' . wfMsg( 'centralnotice-hide-button' ) . '</a>, <a href="#" onclick="insertButton(\'translate\');return false;">' . wfMsg( 'centralnotice-translate-button' ) . '</a>' |
| | 202 | + '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert' ) . ' <a href="#" onclick="insertButton(\'hide\');return false;">' . wfMsg( 'centralnotice-hide-button' ) . '</a>, <a href="#" onclick="insertButton(\'translate\');return false;">' . wfMsg( 'centralnotice-translate-button' ) . '</a>' |
| 203 | 203 | ); |
| 204 | 204 | $htmlOut .= Xml::textarea( 'templateBody', '', 60, 20 ); |
| 205 | 205 | $htmlOut .= Xml::closeElement( 'fieldset' ); |
| — | — | @@ -244,7 +244,7 @@ |
| 245 | 245 | // Begin View Banner fieldset |
| 246 | 246 | $htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) ); |
| 247 | 247 | |
| 248 | | - $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-banner' ) . ': ' . $currentTemplate ); |
| | 248 | + $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-banner-heading', $currentTemplate ) ); |
| 249 | 249 | |
| 250 | 250 | // Show preview of banner |
| 251 | 251 | $render = new SpecialNoticeText(); |
| — | — | @@ -398,7 +398,7 @@ |
| 399 | 399 | $htmlOut .= wfMsg( 'centralnotice-edit-template-summary' ); |
| 400 | 400 | $htmlOut .= Xml::tags( 'div', |
| 401 | 401 | array( 'style' => 'margin-bottom: 0.2em;' ), |
| 402 | | - '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert' ) . ': <a href="#" onclick="insertButton(\'hide\');return false;">' . wfMsg( 'centralnotice-hide-button' ) . '</a>, <a href="#" onclick="insertButton(\'translate\');return false;">' . wfMsg( 'centralnotice-translate-button' ) . '</a>' |
| | 402 | + '<img src="'.$scriptPath.'/down-arrow.png" style="vertical-align:baseline;"/>' . wfMsg( 'centralnotice-insert' ) . ' <a href="#" onclick="insertButton(\'hide\');return false;">' . wfMsg( 'centralnotice-hide-button' ) . '</a>, <a href="#" onclick="insertButton(\'translate\');return false;">' . wfMsg( 'centralnotice-translate-button' ) . '</a>' |
| 403 | 403 | ); |
| 404 | 404 | $htmlOut .= Xml::textarea( 'templateBody', $body, 60, 20, $readonly ); |
| 405 | 405 | if ( $this->editable ) { |
| — | — | @@ -425,7 +425,7 @@ |
| 426 | 426 | $htmlOut .= Xml::fieldset( wfMsg( 'centralnotice-clone-notice' ) ); |
| 427 | 427 | $htmlOut .= Xml::openElement( 'table', array( 'cellpadding' => 9 ) ); |
| 428 | 428 | $htmlOut .= Xml::openElement( 'tr' ); |
| 429 | | - $htmlOut .= Xml::inputLabel( wfMsg( 'centralnotice-clone-name' ) . ':', 'newTemplate', 'newTemplate', '25' ); |
| | 429 | + $htmlOut .= Xml::inputLabel( wfMsg( 'centralnotice-clone-name' ), 'newTemplate', 'newTemplate', '25' ); |
| 430 | 430 | $htmlOut .= Xml::submitButton( wfMsg( 'centralnotice-clone' ), array ( 'id' => 'clone' ) ); |
| 431 | 431 | $htmlOut .= Xml::hidden( 'oldTemplate', $currentTemplate ); |
| 432 | 432 | |
| — | — | @@ -461,7 +461,7 @@ |
| 462 | 462 | // Begin View Banner fieldset |
| 463 | 463 | $htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) ); |
| 464 | 464 | |
| 465 | | - $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-banner' ) . ': ' . $template ); |
| | 465 | + $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-banner-heading', $template ) ); |
| 466 | 466 | |
| 467 | 467 | foreach ( $langs as $lang ) { |
| 468 | 468 | // Link and Preview all available translations |