http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95757
Revision: 95757
Author: nikerabbit
Date: 2011-08-30 11:44:41 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Got rid of const MSG = ...
Modified Paths:
--------------
trunk/extensions/Translate/Translate.i18n.php
trunk/extensions/Translate/TranslateUtils.php
trunk/extensions/Translate/groups/ComplexMessages.php
trunk/extensions/Translate/specials/SpecialMagic.php
trunk/extensions/Translate/specials/SpecialTranslationChanges.php
Modified: trunk/extensions/Translate/Translate.i18n.php
===================================================================
--- trunk/extensions/Translate/Translate.i18n.php 2011-08-30 11:39:43 UTC
(rev 95756)
+++ trunk/extensions/Translate/Translate.i18n.php 2011-08-30 11:44:41 UTC
(rev 95757)
@@ -129,6 +129,7 @@
'translationchanges' => 'Translation changes',
'translationchanges-export' => 'export',
'translationchanges-change' => '$1: $2 by $3',
+ 'translationchanges-submit' => 'Fetch',
'translate-checks-parameters' => 'Following
{{PLURAL:$2|parameter is|parameters are}} not used:
<strong><nowiki>$1</nowiki></strong>',
Modified: trunk/extensions/Translate/TranslateUtils.php
===================================================================
--- trunk/extensions/Translate/TranslateUtils.php 2011-08-30 11:39:43 UTC
(rev 95756)
+++ trunk/extensions/Translate/TranslateUtils.php 2011-08-30 11:44:41 UTC
(rev 95757)
@@ -12,8 +12,6 @@
* Essentially random collection of helper functions, similar to
GlobalFunctions.php.
*/
class TranslateUtils {
- /// @todo Get rid of this constant.
- const MSG = 'translate-';
/**
* Does quick normalisation of message name so that in can be looked
from the
Modified: trunk/extensions/Translate/groups/ComplexMessages.php
===================================================================
--- trunk/extensions/Translate/groups/ComplexMessages.php 2011-08-30
11:39:43 UTC (rev 95756)
+++ trunk/extensions/Translate/groups/ComplexMessages.php 2011-08-30
11:44:41 UTC (rev 95757)
@@ -14,7 +14,6 @@
* @todo Needs documentation.
*/
abstract class ComplexMessages {
- const MSG = 'translate-magic-cm-';
const LANG_MASTER = 0;
const LANG_CHAIN = 1;
@@ -303,8 +302,8 @@
public function getButtons() {
return
- Xml::inputLabel( wfMsg( self::MSG . 'comment' ),
'comment', 'sp-translate-magic-comment' ) .
- Xml::submitButton( wfMsg( self::MSG . 'save' ), array(
'name' => 'savetodb' ) );
+ Xml::inputLabel( wfMsg( 'translate-magic-cm-comment' ),
'comment', 'sp-translate-magic-comment' ) .
+ Xml::submitButton( wfMsg( 'translate-magic-cm-save' ),
array( 'name' => 'savetodb' ) );
}
public function formatElement( $element ) {
@@ -364,11 +363,11 @@
$data = "# DO NOT EDIT THIS PAGE DIRECTLY! Use
[[Special:AdvancedTranslate]].\n<pre>\n" . $this->formatForSave( $request ) .
"\n</pre>";
- $comment = $request->getText( 'comment', wfMsgForContent(
self::MSG . 'updatedusing' ) );
+ $comment = $request->getText( 'comment', wfMsgForContent(
'translate-magic-cm-updatedusing' ) );
$status = $article->doEdit( $data, $comment, 0 );
if ( $status === false || ( is_object( $status ) &&
!$status->isOK() ) ) {
- throw new MWException( wfMsgHtml( self::MSG .
'savefailed' ) );
+ throw new MWException( wfMsg(
'translate-magic-cm-savefailed' ) );
}
/* Reset outdated array */
Modified: trunk/extensions/Translate/specials/SpecialMagic.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialMagic.php 2011-08-30
11:39:43 UTC (rev 95756)
+++ trunk/extensions/Translate/specials/SpecialMagic.php 2011-08-30
11:44:41 UTC (rev 95757)
@@ -15,11 +15,6 @@
* @ingroup SpecialPage TranslateSpecialPage
*/
class SpecialMagic extends SpecialPage {
- /**
- * Message prefix for translations
- * @todo Remove.
- */
- const MSG = 'translate-magic-';
const MODULE_MAGIC = 'words';
const MODULE_SPECIAL = 'special';
@@ -49,7 +44,7 @@
* @see SpecialPage::getDescription
*/
function getDescription() {
- return wfMsg( self::MSG . 'pagename' );
+ return wfMsg( 'translate-magic-pagename' );
}
/**
@@ -74,7 +69,7 @@
'</td><td>' .
$this->moduleSelector( $this->options['module']
) .
'</td></tr><tr><td colspan="2">' .
- Xml::submitButton( wfMsg( self::MSG . 'submit'
) ) . ' ' .
+ Xml::submitButton( wfMsg(
'translate-magic-submit' ) ) . ' ' .
Xml::submitButton( wfMsg(
'translate-magic-cm-export' ), array( 'name' => 'export' ) ) .
'</td></tr></table>' .
Html::hidden( 'title',
$this->getTitle()->getPrefixedText() )
@@ -91,7 +86,7 @@
protected function moduleSelector( $selectedId ) {
$selector = new HTMLSelector( 'module', 'module', $selectedId );
foreach ( $this->aModules as $code ) {
- $selector->addOption( wfMsg( self::MSG . $code ), $code
);
+ $selector->addOption( wfMsg( 'translate-magic-' . $code
), $code );
}
return $selector->getHTML();
}
@@ -194,7 +189,7 @@
return;
}
- $wgOut->addWikiMsg( self::MSG . 'help' );
+ $wgOut->addWikiMsg( 'translate-magic-help' );
$errors = array();
$o->validate( $errors );
if ( $errors ) $this->outputErrors( $errors );
Modified: trunk/extensions/Translate/specials/SpecialTranslationChanges.php
===================================================================
--- trunk/extensions/Translate/specials/SpecialTranslationChanges.php
2011-08-30 11:39:43 UTC (rev 95756)
+++ trunk/extensions/Translate/specials/SpecialTranslationChanges.php
2011-08-30 11:44:41 UTC (rev 95757)
@@ -16,7 +16,6 @@
* @ingroup SpecialPage TranslateSpecialPage
*/
class SpecialTranslationChanges extends SpecialPage {
- const MSG = 'translationchanges-';
function __construct() {
parent::__construct( 'TranslationChanges' );
@@ -48,7 +47,7 @@
global $wgScript;
$limit = self::timeLimitSelector( $this->hours );
- $button = Xml::submitButton( wfMsg( TranslateUtils::MSG .
'submit' ) );
+ $button = Xml::submitButton( wfMsg( 'translationchanges-submit'
) );
$form = Xml::tags( 'form',
array(
@@ -147,7 +146,7 @@
$output .= Xml::element( 'h3', null, $label );
- $exportLabel = wfMsgHtml( self::MSG . 'export'
);
+ $exportLabel = wfMsgHtml(
'translationchanges-export' );
foreach ( $languages as $language => $rows ) {
$index++;
@@ -193,7 +192,7 @@
foreach ( $rows as $row ) {
$date = $wgLang->timeAndDate(
$row->rc_timestamp, /* adj */ true, /* format */ true );
$msg = wfMsgExt(
- self::MSG . 'change',
+
'translationchanges-change',
array( 'parsemag',
'escape' ),
$date,
wfEscapeWikiText(
$row->rc_title ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
