https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114196
Revision: 114196
Author: jeroendedauw
Date: 2012-03-19 21:59:14 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
fix up a bunch of messages
Modified Paths:
--------------
trunk/extensions/EducationProgram/includes/EPCourse.php
trunk/extensions/EducationProgram/includes/EPOrg.php
trunk/extensions/EducationProgram/specials/SpecialInstitutions.php
Modified: trunk/extensions/EducationProgram/includes/EPCourse.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPCourse.php 2012-03-19
21:49:18 UTC (rev 114195)
+++ trunk/extensions/EducationProgram/includes/EPCourse.php 2012-03-19
21:59:14 UTC (rev 114196)
@@ -316,7 +316,7 @@
$html .= '<p>' . $context->msg( 'ep-courses-namedoc'
)->escaped() . '</p>';
- $html .= Html::element( 'label', array( 'for' => 'neworg' ),
$context->msg( 'ep-courses-neworg' ) );
+ $html .= Html::element( 'label', array( 'for' => 'neworg' ),
$context->msg( 'ep-courses-neworg' )->plain() );
$select = new XmlSelect(
'neworg',
@@ -328,7 +328,7 @@
$html .= $select->getHTML();
$html .= ' ' . Xml::inputLabel(
- $context->msg( 'ep-courses-newname' )->escaped(),
+ $context->msg( 'ep-courses-newname' )->plain(),
'newname',
'newname',
20,
@@ -336,7 +336,7 @@
);
$html .= ' ' . Xml::inputLabel(
- $context->msg( 'ep-courses-newterm' )->escaped(),
+ $context->msg( 'ep-courses-newterm' )->plain(),
'newterm',
'newterm',
10,
@@ -345,7 +345,7 @@
$html .= ' ' . Html::input(
'addnewcourse',
- $context->msg( 'ep-courses-add' )->escaped(),
+ $context->msg( 'ep-courses-add' )->plain(),
'submit',
array(
'disabled' => 'disabled',
Modified: trunk/extensions/EducationProgram/includes/EPOrg.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPOrg.php 2012-03-19
21:49:18 UTC (rev 114195)
+++ trunk/extensions/EducationProgram/includes/EPOrg.php 2012-03-19
21:59:14 UTC (rev 114196)
@@ -140,11 +140,12 @@
*
* @since 0.1
*
+ * @param IContextSource $context
* @param array $args
*
* @return string
*/
- public static function getAddNewControl( array $args = array() ) {
+ public static function getAddNewControl( IContextSource $context, array
$args = array() ) {
$html = '';
$html .= Html::openElement(
@@ -157,12 +158,12 @@
$html .= '<fieldset>';
- $html .= '<legend>' . wfMsgHtml( 'ep-institutions-addnew' ) .
'</legend>';
+ $html .= '<legend>' . $context->msg( 'ep-institutions-addnew'
)->escaped() . '</legend>';
- $html .= Html::element( 'p', array(), wfMsg(
'ep-institutions-namedoc' ) );
+ $html .= Html::element( 'p', array(), $context->msg(
'ep-institutions-namedoc' )->plain() );
$html .= Xml::inputLabel(
- wfMsg( 'ep-institutions-newname' ),
+ $context->msg( 'ep-institutions-newname' )->plain(),
'newname',
'newname',
false,
@@ -171,7 +172,7 @@
$html .= ' ' . Html::input(
'addneworg',
- wfMsg( 'ep-institutions-add' ),
+ $context->msg( 'ep-institutions-add' )->plain(),
'submit',
array(
'disabled' => 'disabled',
Modified: trunk/extensions/EducationProgram/specials/SpecialInstitutions.php
===================================================================
--- trunk/extensions/EducationProgram/specials/SpecialInstitutions.php
2012-03-19 21:49:18 UTC (rev 114195)
+++ trunk/extensions/EducationProgram/specials/SpecialInstitutions.php
2012-03-19 21:59:14 UTC (rev 114196)
@@ -40,7 +40,7 @@
if ( $this->getUser()->isAllowed( 'ep-org' ) ) {
$this->getOutput()->addModules( 'ep.addorg' );
- $this->addCachedHTML( 'EPOrg::getAddNewControl'
);
+ $this->addCachedHTML(
'EPOrg::getAddNewControl', $this->getContext() );
}
$this->addCachedHTML( 'EPOrg::getPager',
$this->getContext() );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
