Florianschmidtwelzow has submitted this change and it was merged.
Change subject: Replace deprecated wfMsg* functions in /model
......................................................................
Replace deprecated wfMsg* functions in /model
Bug: T70750
Change-Id: Ibfbabdf3f44aa61c051825c45660bdb2990ba165
---
M model/AuthorSubmission.php
M model/Conference.php
M model/ConferenceAccount.php
M model/ConferenceAuthor.php
M model/ConferenceEvent.php
M model/ConferenceOrganizer.php
M model/ConferencePage.php
M model/ConferencePassportInfo.php
M model/ConferenceRegistration.php
M model/EventLocation.php
10 files changed, 153 insertions(+), 153 deletions(-)
Approvals:
Florianschmidtwelzow: Verified; Looks good to me, approved
diff --git a/model/AuthorSubmission.php b/model/AuthorSubmission.php
index c4b7732..3545f48 100644
--- a/model/AuthorSubmission.php
+++ b/model/AuthorSubmission.php
@@ -108,8 +108,8 @@
}
# create the page title
- $titleSub = $conferenceTitle . '/' . wfMsgForContent(
'cvext-authors' ) . '/' . $username . '/'
- .wfMsgForContent(
'cvext-submissions' ) . '/' . $title;
+ $titleSub = $conferenceTitle . '/' . wfMessage( 'cvext-authors'
)->inContentLanguage()->text() . '/' . $username . '/'
+ .wfMessage( 'cvext-submissions'
)->inContentLanguage()->text() . '/' . $title;
$titleObj = Title::newFromText( $titleSub );
@@ -193,7 +193,7 @@
$conferenceTitle =
ConferenceAuthorUtils::getConferenceTitleFromSubAuthor( $value );
}
} else {
- $msg = ($name === 'submissiontype') ? wfMsg(
'cvext-author-sub-reg-type' ) : wfMsg( 'cvext-author-sub-reg-' . strtolower(
$name ) );
+ $msg = ( $name === 'submissiontype' ) ?
wfMessage( 'cvext-author-sub-reg-type' )->text() : wfMessage(
'cvext-author-sub-reg-' . strtolower( $name ) )->text();
$output .= Xml::openElement( 'dl' )
.Xml::element( 'dt',
array(), $msg )
.Xml::element( 'dd',
array(), $value )
@@ -208,9 +208,9 @@
$output .= Xml::openElement( 'dl' )
.Xml::element( 'dt', array() )
.Xml::openElement( 'dt' )
- .Xml::element( 'a', array( 'href' =>
$editLink ), wfMsg( 'cvext-dash-edit' ) )
- .wfMsg( 'pipe-separator' )
- .Xml::element( 'a', array( 'href' =>
$deleteLink ), wfMsg( 'cvext-dash-delete' ) )
+ .Xml::element( 'a', array( 'href' =>
$editLink ), wfMessage( 'cvext-dash-edit' )->text() )
+ .wfMessage( 'pipe-separator' )->text()
+ .Xml::element( 'a', array( 'href' =>
$deleteLink ), wfMessage( 'cvext-dash-delete' )->text() )
.Xml::closeElement( 'dt' )
.Xml::closeElement( 'dl' );
}
diff --git a/model/Conference.php b/model/Conference.php
index 4c60c17..89c514a 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -314,7 +314,7 @@
if ( $search === false )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-confedit-error'
);
+ $result['msg'] = wfMessage(
'cvext-confedit-error' )->text();
$result['flag'] = self::ERROR_EDIT;
return $result;
@@ -352,7 +352,7 @@
{
$result['done'] = true;
$result['flag'] = self::SUCCESS_CODE;
- $result['msg'] = wfMsg(
'cvext-confedit-success' );
+ $result['msg'] = wfMessage(
'cvext-confedit-success' )->text();
$result['title'] = $title->getText();
$result['venue'] = $venue;
$result['capacity'] = $capacity;
@@ -368,14 +368,14 @@
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-confedit-error'
);
+ $result['msg'] = wfMessage(
'cvext-confedit-error' )->text();
$result['flag'] = self::ERROR_EDIT;
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-confedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-confedit-missing'
)->text();
$result['flag'] = self::ERROR_MISSING;
}
return $result;
diff --git a/model/ConferenceAccount.php b/model/ConferenceAccount.php
index 41d6ce4..f804608 100644
--- a/model/ConferenceAccount.php
+++ b/model/ConferenceAccount.php
@@ -95,7 +95,7 @@
# prepare the title
$mUserId = $mUser->getId();
$username = $mUser->getName();
- $accountTitle = wfMsgForContent( 'cvext-accounts' ) . '/' .
$username;
+ $accountTitle = wfMessage( 'cvext-accounts'
)->inContentLanguage()->text() . '/' . $username;
$title = Title::newFromText( $accountTitle );
$page = WikiPage::factory( $title );
@@ -262,7 +262,7 @@
$conferenceTitle = $conferenceTitleObj->getDBkey();
$user = User::newFromId( $this->mUserId );
$username = $user->getName();
- $titleText = $conferenceTitle . '/' . wfMsgForContent(
'cvext-accounts' ) . '/' . $username;
+ $titleText = $conferenceTitle . '/' . wfMessage(
'cvext-accounts' )->inContentLanguage()->text() . '/' . $username;
$title = Title::newFromText( $titleText );
$page = WikiPage::factory( $title );
$properties = array();
@@ -322,11 +322,11 @@
if ( $user->getId() == 0 )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-accountedit-error' );
+ $result['msg'] = wfMessage( 'cvext-accountedit-error'
)->text();
return $result;
}
$username = $user->getName();
- $titleText = wfMsgForContent( 'cvext-accounts' ) . '/' .
$username;
+ $titleText = wfMessage( 'cvext-accounts'
)->inContentLanguage()->text() . '/' . $username;
$title = Title::newFromText( $titleText );
$page = WikiPage::factory( $title );
$result = array();
@@ -362,7 +362,7 @@
( $status->isOK() &&
$status->hasMessage( 'edit-no-change' ) ) )
{
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-accountedit-success' );
+ $result['msg'] = wfMessage(
'cvext-accountedit-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
}
}
@@ -373,7 +373,7 @@
{
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-accountedit-error' );
+ $result['msg'] = wfMessage(
'cvext-accountedit-error' )->text();
return $result;
}
@@ -381,7 +381,7 @@
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-accountedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-accountedit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
@@ -402,7 +402,7 @@
//step 6. delete passport info
//step 7. delete parent account
$username = $user->getName();
- $titleText = wfMsgForContent( 'cvext-accounts' ) . '/' .
$username;
+ $titleText = wfMessage( 'cvext-accounts'
)->inContentLanguage()->text() . '/' . $username;
/*$titleText = 'accounts/' . $username;*/
$title = Title::newFromText( $titleText );
if ( !$title )
@@ -462,7 +462,7 @@
}
}
}
- $pagePassport = WikiPage::factory( Title::newFromText(
wfMsgForContent( "cvext-passports" ) . "/" . $username ) );
+ $pagePassport = WikiPage::factory( Title::newFromText(
wfMessage( "cvext-passports" )->inContentLanguage()->text() . "/" . $username )
);
$statusPass = $pagePassport->doDeleteArticle( "passport
info is deleted as parent account was deleted" );
if ( $statusPass !== true )
{
@@ -501,12 +501,12 @@
public static function performPassportUpdate( $user, $passport )
{
$username = $user->getName();
- $titleText = wfMsgForContent( 'cvext-passports' ) . '/' .
$username;
+ $titleText = wfMessage( 'cvext-passports'
)->inContentLanguage()->text() . '/' . $username;
$title = Title::newFromText( $titleText );
if ( !$title )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-passedit-error' );
+ $result['msg'] = wfMessage( 'cvext-passedit-error'
)->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
}
@@ -560,7 +560,7 @@
( $status->isOK() &&
$status->hasMessage( 'edit-no-change' ) ) )
{
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-passedit-success' );
+ $result['msg'] = wfMessage(
'cvext-passedit-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
}
}
@@ -570,12 +570,12 @@
if ( !$search || !$newContent ||
$status->value['revision'] )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-passedit-error'
);
+ $result['msg'] = wfMessage(
'cvext-passedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-passedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-passedit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
return $result;
diff --git a/model/ConferenceAuthor.php b/model/ConferenceAuthor.php
index d7a67f6..8e49be4 100644
--- a/model/ConferenceAuthor.php
+++ b/model/ConferenceAuthor.php
@@ -104,7 +104,7 @@
# prepare the page title
$confTitle = $conferenceTitleObj->getDBkey();
$userName = $user->getName();
- $titleParent = wfMsgForContent( 'cvext-authors' ) . '/' .
$userName;
+ $titleParent = wfMessage( 'cvext-authors'
)->inContentLanguage()->text() . '/' . $userName;
$properties = array();
$titleObj = Title::newFromText( $titleParent );
@@ -133,7 +133,7 @@
return null;
}
$newChild = $newParent || !$hasChild;
- $titleChild = $confTitle . '/' . wfMsgForContent(
'cvext-authors' ) . '/' . $userName;
+ $titleChild = $confTitle . '/' . wfMessage( 'cvext-authors'
)->inContentLanguage()->text() . '/' . $userName;
$titleChildObj = Title::newFromText( $titleChild );
$pageChildObj = WikiPage::factory( $titleChildObj );
if ( $newChild ) {
@@ -330,13 +330,13 @@
if ( $status === true ) {
$result['done'] = true;
- $result['msg'] = wfMsg( 'cvext-subdel-success'
);
+ $result['msg'] = wfMessage(
'cvext-subdel-success' )->text();
$result['flag'] = Conference::SUCCESS_CODE;
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-subdel-error' );
+ $result['msg'] = wfMessage(
'cvext-subdel-error' )->text();
$result['flag'] = Conference::ERROR_DELETE;
}
@@ -344,7 +344,7 @@
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-subdel-missing' );
+ $result['msg'] = wfMessage( 'cvext-subdel-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
@@ -364,7 +364,7 @@
if ( $user->getId() == 0 ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-subauthdel-internalerr'
);
+ $result['msg'] = wfMessage(
'cvext-subauthdel-internalerr' )->text();
return $result;
}
@@ -373,14 +373,14 @@
$result['done'] = false;
$result['flag'] = Conference::INVALID_CONF_ID;
- $result['msg'] = wfMsg( 'cvext-subauthdel-internalerr'
);
+ $result['msg'] = wfMessage(
'cvext-subauthdel-internalerr' )->text();
$result['cause'] = 'Conference Title Object could not
be loaded';
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
$username = $user->getName();
- $titleText = $confTitle . '/' . wfMsgForContent(
'cvext-authors' ) . '/' . $username;
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-authors'
)->inContentLanguage()->text() . '/' . $username;
$title = Title::newFromText( $titleText );
$page = WikiPage::factory( $title );
$result = array();
@@ -454,12 +454,12 @@
*/
public static function performAuthorEdit( $username, $country,
$affiliation, $url ) {
- $titleText = wfMsgForContent( 'cvext-authors' ) . '/' .
$username;
+ $titleText = wfMessage( 'cvext-authors'
)->inContentLanguage()->text() . '/' . $username;
$title = Title::newFromText( $titleText );
if ( !$title ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-authoredit-error' );
+ $result['msg'] = wfMessage( 'cvext-authoredit-error'
)->text();
return $result;
}
@@ -495,13 +495,13 @@
( $status->isOK() &&
$status->hasMessage( 'edit-no-change' ) ) ) {
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-authoredit-success' );
+ $result['msg'] = wfMessage(
'cvext-authoredit-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
} else {
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-authoredit-error' );
+ $result['msg'] = wfMessage(
'cvext-authoredit-error' )->text();
$result['flag'] =
Conference::ERROR_EDIT;
}
@@ -511,14 +511,14 @@
if ( !$content || !$search ) {
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-authoredit-error' );
+ $result['msg'] = wfMessage(
'cvext-authoredit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-authoredit-missing' );
+ $result['msg'] = wfMessage( 'cvext-authoredit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
@@ -541,15 +541,15 @@
list( $title, $type, $abstract, $track, $length, $slidesInfo,
$slotReq ) = array_values( $properties );
# prepare the title
$username = $user->getName();
- $titleText = $conferenceTitle . '/' . wfMsgForContent(
'cvext-authors' ) . '/' . $username . '/'
- . wfMsgForContent( 'cvext-submissions' ) . '/'
. $title;
+ $titleText = $conferenceTitle . '/' . wfMessage(
'cvext-authors' )->inContentLanguage()->text() . '/' . $username . '/'
+ . wfMessage( 'cvext-submissions'
)->inContentLanguage()->text() . '/' . $title;
$titleObj = Title::newFromText( $titleText );
# valid title
if ( !$titleObj ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-subedit-error' );
+ $result['msg'] = wfMessage( 'cvext-subedit-error'
)->text();
return $result;
}
@@ -605,7 +605,7 @@
( $status->isOK() &&
$status->hasMessage( 'edit-no-change' ) ) ) {
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-subedit-success' );
+ $result['msg'] = wfMessage(
'cvext-subedit-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
}
@@ -618,7 +618,7 @@
if ( !$search || !$newContent ||
!$status->value['revision'] ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-subedit-error' );
+ $result['msg'] = wfMessage(
'cvext-subedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
@@ -626,7 +626,7 @@
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-subedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-subedit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
@@ -842,7 +842,7 @@
$authorId = $parser->getTitle()->getArticleId();
$output = Xml::openElement( 'table' )
.Xml::openElement( 'tr' )
- .Xml::element( 'td', array(),
wfMsg( 'cvext-author-details' ) )
+ .Xml::element( 'td', array(),
wfMessage( 'cvext-author-details' )->text() )
.Xml::closeElement( 'tr' );
foreach ( $args as $name => $value )
{
@@ -854,14 +854,14 @@
$parser->getOutput()->setProperty(
$name, $value );
$user = User::newFromId( $value );
$userLink = "[[" .
$user->getUserPage()->getPrefixedText() . "|" . $user->getName() . "]]";
- $output .= Xml::element( 'td', array(),
wfMsg( 'cvext-user' ) )
+ $output .= Xml::element( 'td', array(),
wfMessage( 'cvext-user' )->text() )
.Xml::element(
'td', array(), $userLink );
}
} else {
// Give grep a chance to find the usages:
// cvext-author-edit-legend,
cvext-author-edit-country,
// cvext-author-edit-affiliation,
cvext-author-edit-blogurl
- $output .= Xml::element( 'td', array(), wfMsg(
'cvext-author-edit-' . strtolower( $name ) ) )
+ $output .= Xml::element( 'td', array(),
wfMessage( 'cvext-author-edit-' . strtolower( $name ) )->text() )
.Xml::element( 'td',
array(), $value );
}
$output .= Xml::closeElement( 'tr' );
@@ -874,9 +874,9 @@
$output .= Xml::openElement( 'tr' )
.Xml::element( 'td' )
.Xml::openElement( 'td' )
- ."<span
class=\"plainlinks\">[" . $editLink . " " . wfMsg( 'cvext-dash-edit' ) .
"]</span>"
- .wfMsg(
'pipe-separator' )
- ."<span
class=\"plainlinks\">[" . $deleteLink . " " . wfMsg( 'cvext-dash-delete' ) .
"]</span>"
+ ."<span
class=\"plainlinks\">[" . $editLink . " " . wfMessage( 'cvext-dash-edit'
)->text() . "]</span>"
+ .wfMessage(
'pipe-separator' )->text()
+ ."<span
class=\"plainlinks\">[" . $deleteLink . " " . wfMessage( 'cvext-dash-delete'
)->text() . "]</span>"
.Xml::closeElement( 'td' )
.Xml::closeElement( 'tr' );
}
diff --git a/model/ConferenceEvent.php b/model/ConferenceEvent.php
index 01ddb86..2520f3d 100644
--- a/model/ConferenceEvent.php
+++ b/model/ConferenceEvent.php
@@ -68,7 +68,7 @@
foreach ( self::$mPreloadedGroups as $key )
{
$key = 'cvext-groups-' . $key;
- $groups[] = $lang === 'contlang' ? wfMsgForContent(
$key ) : wfMsg( $key );
+ $groups[] = $lang === 'contlang' ? wfMessage( $key
)->inContentLanguage()->text() : wfMessage( $key )->text();
}
return $groups;
}
@@ -152,7 +152,7 @@
return self::newFromProperties(
$eventProperties );
}
$confTitle = $conferenceTitleObj->getDBkey();
- $titleText = $confTitle . '/' . wfMsgForContent(
'cvext-events' ) . '/' . $mTopic . '-' . $mDay . '-'
+ $titleText = $confTitle . '/' . wfMessage(
'cvext-events' )->inContentLanguage()->text() . '/' . $mTopic . '-' . $mDay .
'-'
. $mStartTime . '-' . $mEndTime . '-' .
$mGroup;
$title = Title::newFromText( $titleText );
$page = WikiPage::factory( $title );
@@ -227,12 +227,12 @@
if ( !$conferenceTitleObj )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-eventedit-internalerr' );
+ $result['msg'] = wfMessage(
'cvext-eventedit-internalerr' )->text();
$result['flag'] = Conference::INVALID_CONF_ID;
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
- $titleText = $confTitle . '/' . wfMsgForContent( 'cvext-events'
) .'/' . $mTopic . '-' . $mDay . '-'
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-events'
)->inContentLanguage()->text() .'/' . $mTopic . '-' . $mDay . '-'
. $mStartTime . '-' . $mEndTime . '-' . $mGroup;
$title = Title::newFromText( $titleText );
$page = WikiPage::factory( $title );
@@ -254,7 +254,7 @@
if ( $search === false )
{
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-eventedit-internalerr' );
+ $result['msg'] = wfMessage(
'cvext-eventedit-internalerr' )->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
}
@@ -307,10 +307,10 @@
if ( $status->value['revision'] ||
( $status->isOK() &&
$status->hasMessage( 'edit-no-change' ) ) )
{
- $completeLocTitle = $confTitle . '/' .
wfMsgForContent( 'cvext-locations' ) . '/' . $mLocation->getRoomNo();
+ $completeLocTitle = $confTitle . '/' .
wfMessage( 'cvext-locations' )->inContentLanguage()->text() . '/' .
$mLocation->getRoomNo();
$locationUrl = Title::makeTitle(
NS_MAIN, $completeLocTitle )->getFullURL();
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-eventedit-success' );
+ $result['msg'] = wfMessage(
'cvext-eventedit-success' )->text();
$result['eventurl'] =
$page->getTitle()->getFullURL();
$result['starttime'] = $mStartTime;
$result['endtime'] = $mEndTime;
@@ -327,13 +327,13 @@
if ( !$content || !$status->value['revision'] )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-eventedit-error'
);
+ $result['msg'] = wfMessage(
'cvext-eventedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-eventedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-eventedit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
return $result;
@@ -356,18 +356,18 @@
{
$result['done'] = false;
$result['flag'] = Conference::INVALID_CONF_ID;
- $result['msg'] = wfMsg( 'cvext-eventdel-internalerr' );
+ $result['msg'] = wfMessage(
'cvext-eventdel-internalerr' )->text();
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
- $titleText = $confTitle . '/' . wfMsgForContent( 'cvext-events'
) . '/' . $mTopic . '-' . $mDay . '-'
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-events'
)->inContentLanguage()->text() . '/' . $mTopic . '-' . $mDay . '-'
. $mStartTime . '-' . $mEndTime . '-' . $mGroup;
$title = Title::newFromText( $titleText );
if ( !$title )
{
$result['done'] = false;
$result['flag'] = Conference::ERROR_EDIT;
- $result['msg'] = wfMsg( 'cvext-eventdel-internalerr' );
+ $result['msg'] = wfMessage(
'cvext-eventdel-internalerr' )->text();
return $result;
}
$page = WikiPage::factory( $title );
@@ -384,24 +384,24 @@
if ( $dbr->numRows( $res ) > 0 )
{
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-eventdel-with-reg' );
+ $result['msg'] = wfMessage(
'cvext-eventdel-with-reg' )->text();
} else {
$status = $page->doDeleteArticle( "event is
deleted by the admin", Revision::DELETED_TEXT );
if ( $status === true )
{
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-eventdel-success' );
+ $result['msg'] = wfMessage(
'cvext-eventdel-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
} else {
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-eventdel-error' );
+ $result['msg'] = wfMessage(
'cvext-eventdel-error' )->text();
$result['flag'] =
Conference::ERROR_DELETE;
}
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-eventdel-missing' );
+ $result['msg'] = wfMessage( 'cvext-eventdel-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
return $result;
@@ -418,7 +418,7 @@
{
$output = Xml::openElement( 'table' )
.Xml::openElement( 'tr')
- .Xml::element( 'td', array(),
wfMsg( 'cvext-event-details' ) )
+ .Xml::element( 'td', array(),
wfMessage( 'cvext-event-details' )->text() )
.Xml::closeElement( 'tr');
$id = $parser->getTitle()->getArticleId();
foreach ( $args as $name => $value )
@@ -431,7 +431,7 @@
$parser->getOutput()->setProperty(
$name, $value );
}
$title = Title::newFromID( $value );
- $output .= Xml::element( 'td', array(), wfMsg(
$name ) )
+ $output .= Xml::element( 'td', array(),
wfMessage( $name )->text() )
.Xml::openElement( 'td'
)
."[[" .
$title->getPrefixedText() . "|" .$title->getText() . "]]"
.Xml::closeElement(
'td');
@@ -439,7 +439,7 @@
// Give grep a chance to find the usages:
// cvext-dash-evts-topic,
cvext-dash-evts-group, cvext-dash-evts-day,
// cvext-dash-evts-starttime,
cvext-dash-evts-endtime, cvext-dash-evts-location
- $output .= Xml::element( 'td', array(), wfMsg(
'cvext-dash-evts-' . strtolower( $name ) ) )
+ $output .= Xml::element( 'td', array(),
wfMessage( 'cvext-dash-evts-' . strtolower( $name ) )->text() )
.Xml::element( 'td',
array(), $value );
}
$output .= Xml::closeElement( 'tr' );
diff --git a/model/ConferenceOrganizer.php b/model/ConferenceOrganizer.php
index c2388d0..ba94c06 100644
--- a/model/ConferenceOrganizer.php
+++ b/model/ConferenceOrganizer.php
@@ -66,7 +66,7 @@
}
$confTitle = $conferenceTitleObj->getDBkey();
$username = $user->getName();
- $title = $confTitle . '/' . wfMsgForContent( 'cvext-organizers'
) . '/' . $username;
+ $title = $confTitle . '/' . wfMessage( 'cvext-organizers'
)->inContentLanguage()->text() . '/' . $username;
$titleObj = Title::newFromText( $title );
$pageObj = WikiPage::factory( $titleObj );
if ( $isOrganizerForConference === false )
@@ -177,18 +177,18 @@
{
$result['done'] = false;
$result['flag'] = Conference::INVALID_CONF_ID;
- $result['msg'] = wfMsg( 'cvext-orgedit-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-orgedit-internalerr'
)->text();
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
- $title = $confTitle . '/' . wfMsgForContent( 'cvext-organizers'
) . '/' . $username;
+ $title = $confTitle . '/' . wfMessage( 'cvext-organizers'
)->inContentLanguage()->text() . '/' . $username;
$titleObj = Title::newFromText( $title );
if ( !$titleObj )
{
$result['done'] = false;
$result['flag'] = Conference::ERROR_EDIT;
- $result['msg'] = wfMsg( 'cvext-orgedit-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-orgedit-internalerr'
)->text();
return $result;
}
$page = WikiPage::factory( $titleObj );
@@ -206,7 +206,7 @@
{
$result['done'] = false;
$result['flag'] = Conference::ERROR_EDIT;
- $result['msg'] = wfMsg(
'cvext-orgedit-internalerr' );
+ $result['msg'] = wfMessage(
'cvext-orgedit-internalerr' )->text();
return $result;
}
$categoryString = $matches[1][0];
@@ -241,7 +241,7 @@
#error
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-orgedit-catpost-exists' );
+ $result['msg'] = wfMessage(
'cvext-orgedit-catpost-exists' )->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
@@ -277,19 +277,19 @@
if ( $status->value['revision'] )
{
$result['done'] = true;
- $result['msg'] = wfMsg( 'cvext-orgedit-success'
);
+ $result['msg'] = wfMessage(
'cvext-orgedit-success' )->text();
$result['category'] =
$catpostNew[0]['category'];
$result['post'] = $catpostNew[0]['post'];
$result['flag'] = Conference::SUCCESS_CODE;
$result['catpost'] = $newCategoryPost;
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-orgedit-error' );
+ $result['msg'] = wfMessage(
'cvext-orgedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-orgedit-missing',
$username );
+ $result['msg'] = wfMessage( 'cvext-orgedit-missing',
$username )->text();
$result['flag'] = Conference::ERROR_MISSING;
}
return $result;
@@ -315,18 +315,18 @@
{
$result['done'] = false;
$result['flag'] = Conference::INVALID_CONF_ID;
- $result['msg'] = wfMsg( 'cvext-orgdel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-orgdel-internalerr'
)->text();
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
/* already validated this title in
ApiConferenceOrganizerDelete.php */
- $title = $confTitle . '/' . wfMsgForContent( 'cvext-organizers'
) . '/' . $username;
+ $title = $confTitle . '/' . wfMessage( 'cvext-organizers'
)->inContentLanguage()->text() . '/' . $username;
$titleObj = Title::newFromText( $title );
if ( !$titleObj )
{
$result['done'] = false;
$result['flag'] = Conference::ERROR_EDIT;
- $result['msg'] = wfMsg( 'cvext-orgdel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-orgdel-internalerr'
)->text();
return $result;
}
$page = WikiPage::factory( $titleObj );
@@ -334,7 +334,7 @@
if ( !$page->exists() )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-orgdel-missing',
$username, $confTitle );
+ $result['msg'] = wfMessage( 'cvext-orgdel-missing',
$username, $confTitle )->text();
$result['flag'] = Conference::ERROR_MISSING;
return $result;
}
@@ -348,7 +348,7 @@
{
$result['done'] = false;
$result['flag'] = Conference::INVALID_CONF_ID;
- $result['msg'] = wfMsg( 'cvext-orgdel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-orgdel-internalerr'
)->text();
return $result;
}
@@ -365,11 +365,11 @@
if ( $status === true )
{
$result['done'] = true;
- $result['msg'] = wfMsg( 'cvext-orgdel-success'
);
+ $result['msg'] = wfMessage(
'cvext-orgdel-success' )->text();
$result['flag'] = Conference::SUCCESS_CODE;
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-orgdel-error' );
+ $result['msg'] = wfMessage(
'cvext-orgdel-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
@@ -394,7 +394,7 @@
//it means cat,post pair was not found
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-orgdel-catpost-missing' );
+ $result['msg'] = wfMessage(
'cvext-orgdel-catpost-missing' )->text();
$result['flag'] = Conference::ERROR_MISSING;
return $result;
@@ -411,7 +411,7 @@
if ( $status->value['revision'] )
{
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-orgdel-success' );
+ $result['msg'] = wfMessage(
'cvext-orgdel-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
}
}
@@ -419,7 +419,7 @@
if ( !$content || !$status->value['revision'] )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-orgdel-error' );
+ $result['msg'] = wfMessage(
'cvext-orgdel-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
}
@@ -448,14 +448,14 @@
$postSectionText = "===" . $post . "=== \n";
$postSectionText .= $generateUserLink ? ("*'''[[" . $userLink .
'|' . ( $realName ? $realName : $user->getName() )
. "]]''' \n") : "*'''No User'''";
- $postSectionText .= "** " . wfMsgForContent( 'cvext-org-email'
) . " : \n";
- $postSectionText .= "** " . wfMsgForContent( 'cvext-org-phone'
) . " : \n";
- $postSectionText .= "** " . wfMsgForContent(
'cvext-org-cellphone' ) . " : \n";
- $postSectionText .= "** " . wfMsgForContent( 'cvext-org-im' ) .
" : \n";
- $postSectionText .= "** " . wfMsgForContent( 'cvext-org-other'
) . " : \n";
- $postSectionText .= "** " . wfMsgForContent(
'cvext-org-citytime' ) . " : \n";
- $postSectionText .= "** " . wfMsgForContent(
'cvext-org-accessibility' ) . " : \n";
- $postSectionText .= "** " . wfMsgForContent(
'cvext-org-languages' ) . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-email'
)->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-phone'
)->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-cellphone'
)->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-im'
)->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-other'
)->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-citytime'
)->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage(
'cvext-org-accessibility' )->inContentLanguage()->text() . " : \n";
+ $postSectionText .= "** " . wfMessage( 'cvext-org-languages'
)->inContentLanguage()->text() . " : \n";
return $postSectionText;
}
/**
@@ -503,7 +503,7 @@
global $wgUser;
$user = $user ? $user : $wgUser;
$username = $user->getName();
- $orgTitle = Title::newFromText( $conferenceTitle . '/' .
wfMsgForContent( 'cvext-organizers' ) . '/' . $username );
+ $orgTitle = Title::newFromText( $conferenceTitle . '/' .
wfMessage( 'cvext-organizers' )->inContentLanguage()->text() . '/' . $username
);
if ( $orgTitle && $orgTitle->exists() )
{
$orgId = $orgTitle->getArticleID();
diff --git a/model/ConferencePage.php b/model/ConferencePage.php
index 8864386..7a1a540 100644
--- a/model/ConferencePage.php
+++ b/model/ConferencePage.php
@@ -79,7 +79,7 @@
foreach ( self::$mPreloadedTypes as $key ) {
$key = $key === 'aboutcity' ? $key = $key . '-plain' :
$key;
- $types[] = $lang === 'contlang' ? wfMsgForContent(
'cvext-' . $key ) : wfMsg( 'cvext-' . $key );
+ $types[] = $lang === 'contlang' ? wfMessage( 'cvext-' .
$key )->inContentLanguage()->text() : wfMessage( 'cvext-' . $key )->text();
}
return $types;
@@ -136,7 +136,7 @@
}
$confTitle = $conferenceTitleObj->getDBkey();
- $title = $confTitle . '/'. wfMsgForContent( 'cvext-pages' ) .
'/' . $type;
+ $title = $confTitle . '/'. wfMessage( 'cvext-pages'
)->inContentLanguage()->text() . '/' . $type;
$titleObj = Title::newFromText( $title );
if ( !$titleObj ) {
@@ -206,7 +206,7 @@
if ( empty( $conferenceTag ) ) {
return array( 'error' => true );
}
- $text .= "==" . wfMsgForContent(
'cvext-schedule-heading' ) . "==\n";
+ $text .= "==" . wfMessage(
'cvext-schedule-heading' )->inContentLanguage()->text() . "==\n";
$days = CommonUtils::getAllConferenceDays(
$conferenceTag['startDate'], $conferenceTag['endDate'] );
foreach ( $days as $day ) {
@@ -217,9 +217,9 @@
}
break;
case 'submission':
- $text .= "==" . wfMsgForContent(
'cvext-submission-overview' ) . "==\n";
- $text .= "==" . wfMsgForContent(
'cvext-submission-length' ) . "==\n";
- $text .= "==" . wfMsgForContent(
'cvext-submission-tracks' ) . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-overview' )->inContentLanguage()->text() . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-length' )->inContentLanguage()->text() . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-tracks' )->inContentLanguage()->text() . "==\n";
/*
* put all the tracks as sub headings
*/
@@ -229,20 +229,20 @@
$text .= $track['description'] . "\n";
}
- $text .= "==" . wfMsgForContent(
'cvext-submission-how' ) . "== \n";
+ $text .= "==" . wfMessage(
'cvext-submission-how' )->inContentLanguage()->text() . "== \n";
break;
case 'scholarships':
- $text .= "==" . wfMsgForContent(
'cvext-submission-program' ) . "==\n";
- $text .= "==" . wfMsgForContent(
'cvext-submission-goals' ) . "==\n";
- $text .= "==" . wfMsgForContent(
'cvext-submission-application' ) . "==\n";
- $text .= "'''" . wfMsgForContent(
'cvext-submission-eligibility' ) . "''' :" . "\n";
- $text .= "'''" . wfMsgForContent(
'cvext-submission-selection' ) . "''' :" . "\n";
- $text .= "'''" . wfMsgForContent(
'cvext-submission-deadline' ) . "''' :" . "\n";
- $text .= "===" . wfMsgForContent(
'cvext-submission-process' ) . "===\n";
- $text .= "===" . wfMsgForContent(
'cvext-submission-types' ) . "===\n";
- $text .= "===" . wfMsgForContent(
'cvext-submission-criteria' ) . "===\n";
- $text .= "==" . wfMsgForContent(
'cvext-submission-questions' ) . "==\n";
- $text .= "==" . wfMsgForContent(
'cvext-submission-apply' ) . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-program' )->inContentLanguage()->text() . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-goals' )->inContentLanguage()->text() . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-application' )->inContentLanguage()->text() . "==\n";
+ $text .= "'''" . wfMessage(
'cvext-submission-eligibility' )->inContentLanguage()->text() . "''' :" . "\n";
+ $text .= "'''" . wfMessage(
'cvext-submission-selection' )->inContentLanguage()->text() . "''' :" . "\n";
+ $text .= "'''" . wfMessage(
'cvext-submission-deadline' )->inContentLanguage()->text() . "''' :" . "\n";
+ $text .= "===" . wfMessage(
'cvext-submission-process' )->inContentLanguage()->text() . "===\n";
+ $text .= "===" . wfMessage(
'cvext-submission-types' )->inContentLanguage()->text() . "===\n";
+ $text .= "===" . wfMessage(
'cvext-submission-criteria' )->inContentLanguage()->text() . "===\n";
+ $text .= "==" . wfMessage(
'cvext-submission-questions' )->inContentLanguage()->text() . "==\n";
+ $text .= "==" . wfMessage(
'cvext-submission-apply' )->inContentLanguage()->text() . "==\n";
break;
case 'press':
break;
@@ -251,13 +251,13 @@
case 'aboutcity':
break;
case 'venue':
- $text .= "==" . wfMsgForContent(
'cvext-locations-heading' ) . "==\n";
+ $text .= "==" . wfMessage(
'cvext-locations-heading' )->inContentLanguage()->text() . "==\n";
$locations = Conference::getLocationsFromDB(
$conferenceId );
if ( $locations ) {
foreach ( $locations as $location ) {
- $locationLink =
Title::newFromText( $conferenceTitle . '/' . wfMsgForContent( 'cvext-locations'
) . '/'
+ $locationLink =
Title::newFromText( $conferenceTitle . '/' . wfMessage( 'cvext-locations'
)->inContentLanguage()->text() . '/'
.
$location->getRoomNo() )->getDBKey();
$text .= "*[[" . $locationLink
. "|" . $location->getRoomNo() . "]] \n";
@@ -457,18 +457,18 @@
if ( !$conferenceTitleObj ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pagedel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-pagedel-internalerr'
)->text();
$result['flag'] = Conference::INVALID_CONF_ID;/* it
doesnt signify the actual error which may have happened */
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
- $titleText = $confTitle . '/' . wfMsgForContent( 'cvext-pages'
) . '/' . $type;
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-pages'
)->inContentLanguage()->text() . '/' . $type;
$title = Title::newFromText( $titleText );
if ( !$title ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pagedel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-pagedel-internalerr'
)->text();
$result['flag'] = Conference::ERROR_EDIT;/* it doesnt
signify the actual error which may have happened */
return $result;
@@ -481,7 +481,7 @@
if ( $status === true ) {
$result['done'] = true;
- $result['msg'] = wfMsg( 'cvext-pagedel-success'
);
+ $result['msg'] = wfMessage(
'cvext-pagedel-success' )->text();
$result['preloaded'] = self::isPreloadedType(
$type );
$result['pagetype'] = $type;
$result['flag'] = Conference::SUCCESS_CODE;
@@ -489,7 +489,7 @@
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pagedel-error' );
+ $result['msg'] = wfMessage(
'cvext-pagedel-error' )->text();
$result['flag'] = Conference::ERROR_DELETE;
}
@@ -497,7 +497,7 @@
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pagedel-missing' );
+ $result['msg'] = wfMessage( 'cvext-pagedel-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
@@ -518,18 +518,18 @@
if ( !$conferenceTitleObj ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pageedit-internalerr' );
+ $result['msg'] = wfMessage(
'cvext-pageedit-internalerr' )->text();
$result['flag'] = Conference::INVALID_CONF_ID;
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
- $titleText = $confTitle . '/' . wfMsgForContent( 'cvext-pages'
) . '/' . $type;
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-pages'
)->inContentLanguage()->text() . '/' . $type;
$title = Title::newFromText( $titleText );
if ( !$title ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pageedit-invalidtype' );
+ $result['msg'] = wfMessage(
'cvext-pageedit-invalidtype' )->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
@@ -546,7 +546,7 @@
if ( $search === false ) /* an error occurs while
performing a regexp match */ {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pageedit-error'
);
+ $result['msg'] = wfMessage(
'cvext-pageedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
@@ -554,14 +554,14 @@
if ( !$type ) {
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-pageedit-nulltype' );
+ $result['msg'] = wfMessage(
'cvext-pageedit-nulltype' )->text();
$result['flag'] = Conference::INVALID_CONTENT;
return $result;
} elseif ( $type == $matches[2][0] ) {
$result['done'] = true;
- $result['msg'] = wfMsg( 'cvext-pageedit-same' );
+ $result['msg'] = wfMessage(
'cvext-pageedit-same' )->text();
$result['flag'] = Conference::NO_EDIT_NEEDED;
$result['urlto'] =
$page->getTitle()->getFullURL();
return $result;
@@ -580,7 +580,7 @@
if ( $status->value['revision'] ) {
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-pageedit-success' );
+ $result['msg'] = wfMessage(
'cvext-pageedit-success' )->text();
$result['pagetypeto'] = $type;
$result['urlto'] =
$page->getTitle()->getFullURL();
@@ -590,7 +590,7 @@
if ( !$content || !$status->value['revision'] ) {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pageedit-error'
);
+ $result['msg'] = wfMessage(
'cvext-pageedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
@@ -598,7 +598,7 @@
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-pageedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-pageedit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
diff --git a/model/ConferencePassportInfo.php b/model/ConferencePassportInfo.php
index 2ebfec5..76f8dc2 100644
--- a/model/ConferencePassportInfo.php
+++ b/model/ConferencePassportInfo.php
@@ -97,7 +97,7 @@
{
return null;
}
- $passportTitle = wfMsgForContent( 'cvext-passports' ) . '/' .
$username;
+ $passportTitle = wfMessage( 'cvext-passports'
)->inContentLanguage()->text() . '/' . $username;
$passportTitleObj = Title::newFromText( $passportTitle );
$passportPage = WikiPage::factory( $passportTitleObj );
diff --git a/model/ConferenceRegistration.php b/model/ConferenceRegistration.php
index c045b70..68782fd 100644
--- a/model/ConferenceRegistration.php
+++ b/model/ConferenceRegistration.php
@@ -135,7 +135,7 @@
# create title for the registration wiki page
$username = ConferenceAccountUtils::getUsernameFromSubAccount(
$mAccountId );
$confTitle =
ConferenceAccountUtils::getConferenceTitleFromSubAccount( $mAccountId );
- $titleText = $confTitle . '/' . wfMsgForContent(
'cvext-registrations' ) . '/' . $username;
+ $titleText = $confTitle . '/' . wfMessage(
'cvext-registrations' )->inContentLanguage()->text() . '/' . $username;
$title = $username && $confTitle ? Title::newFromText(
$titleText ) : null;
if ( !$title )
{
@@ -156,7 +156,7 @@
$dbw = wfGetDB(DB_MASTER);
foreach ( $mEvents as $event )
{
- $titleEventText = $confTitle . '/' . $username
. '/' . wfMsgForContent( 'cvext-registration-event', $i );
+ $titleEventText = $confTitle . '/' . $username
. '/' . wfMessage( 'cvext-registration-event', $i
)->inContentLanguage()->text();
$titleEvent = Title::newFromText(
$titleEventText );
$eventPage = WikiPage::factory( $titleEvent );
$eventText = Xml::element(
'registration-event', array( 'cvext-registration-parent' => $id,
diff --git a/model/EventLocation.php b/model/EventLocation.php
index 8047b4c..ae83b02 100644
--- a/model/EventLocation.php
+++ b/model/EventLocation.php
@@ -63,7 +63,7 @@
return new self($roomNo, $description, $url);
}
$confTitle = $conferenceTitleObj->getDBkey();
- $title = $confTitle . '/' . wfMsgForContent( 'cvext-locations'
) . '/' . $roomNo;
+ $title = $confTitle . '/' . wfMessage( 'cvext-locations'
)->inContentLanguage()->text() . '/' . $roomNo;
/* we are not validating this title here, as it has already
been validated in ApiConferenceLocationAdd.php */
$titleObj = Title::newFromText( $title );
if ( !$titleObj )
@@ -116,18 +116,18 @@
if ( !$conferenceTitleObj )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locdel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-locdel-internalerr'
)->text();
$result['flag'] = Conference::INVALID_CONF_ID;
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
/* we have already validated this title in
ApiConferenceLocationDelete.php */
- $titleText = $confTitle . '/' . wfMsgForContent(
'cvext-locations' ) . '/' . $roomNo;
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-locations'
)->inContentLanguage()->text() . '/' . $roomNo;
$title = Title::newFromText( $titleText );
if ( !$title )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locdel-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-locdel-internalerr'
)->text();
$result['flag'] = Conference::ERROR_DELETE;
return $result;
}
@@ -141,7 +141,7 @@
{
//$result['hasEvent']=true;
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-locdel-with-event' );
+ $result['msg'] = wfMessage(
'cvext-locdel-with-event' )->text();
$result['flag'] =
Conference::ERROR_PARENT_PRESENT;
}
else {
@@ -150,11 +150,11 @@
if ( $status === true )
{
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-locdel-success' );
+ $result['msg'] = wfMessage(
'cvext-locdel-success' )->text();
$result['flag'] =
Conference::SUCCESS_CODE;
} else {
$result['done'] = false;
- $result['msg'] = wfMsg(
'cvext-locdel-error' );
+ $result['msg'] = wfMessage(
'cvext-locdel-error' )->text();
$result['flag'] =
Conference::ERROR_DELETE;
}
}
@@ -162,7 +162,7 @@
else
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locdel-missing' );
+ $result['msg'] = wfMessage( 'cvext-locdel-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
return $result;
@@ -186,7 +186,7 @@
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locedit-allnull' );
+ $result['msg'] = wfMessage( 'cvext-locedit-allnull'
)->text();
$result['flag'] = Conference::INVALID_CONTENT;
return $result;
@@ -196,11 +196,11 @@
{
$result['done'] = false;
$result['flag'] = Conference::INVALID_CONF_ID;/* it may
not account for the actual error */
- $result['msg'] = wfMsg( 'cvext-locedit-internalerr' );
+ $result['msg'] = wfMessage( 'cvext-locedit-internalerr'
)->text();
return $result;
}
$confTitle = $conferenceTitleObj->getDBkey();
- $titleText = $confTitle . '/' . wfMsgForContent(
'cvext-locations' ) . '/' . $roomNo;
+ $titleText = $confTitle . '/' . wfMessage( 'cvext-locations'
)->inContentLanguage()->text() . '/' . $roomNo;
/* we have already validated this title in
ApiConferenceLocationEdit.php */
$title = Title::newFromText( $titleText );
$page = WikiPage::factory( $title );
@@ -216,7 +216,7 @@
if ( $search === false )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locedit-error' );
+ $result['msg'] = wfMessage(
'cvext-locedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
return $result;
}
@@ -236,7 +236,7 @@
if ( $roomNo === $matches[1][0] && $description ===
$matches[2][0] && $url === $matches[3][0] )
{
$result['done'] = true;
- $result['msg'] = wfMsg( 'cvext-locedit-same' );
+ $result['msg'] = wfMessage(
'cvext-locedit-same' )->text();
$result['flag'] = Conference::NO_EDIT_NEEDED;
$result['roomno'] = $roomNo;
$result['description'] = $description;
@@ -256,7 +256,7 @@
( $status->isOK() &&
$status->hasMessage( 'edit-no-change' ) ) )
{
$result['done'] = true;
- $result['msg'] = wfMsg(
'cvext-locedit-success' );
+ $result['msg'] = wfMessage(
'cvext-locedit-success' )->text();
$result['roomno'] = $roomNo;
$result['description'] = $description;
$result['url'] = $url;
@@ -268,13 +268,13 @@
if ( !$content || !$status->value['revision'] )
{
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locedit-error' );
+ $result['msg'] = wfMessage(
'cvext-locedit-error' )->text();
$result['flag'] = Conference::ERROR_EDIT;
}
} else {
$result['done'] = false;
- $result['msg'] = wfMsg( 'cvext-locedit-missing' );
+ $result['msg'] = wfMessage( 'cvext-locedit-missing'
)->text();
$result['flag'] = Conference::ERROR_MISSING;
}
return $result;
@@ -311,7 +311,7 @@
$id = $parser->getTitle()->getArticleId();
$output = Xml::openElement( 'table' )
.Xml::openElement( 'tr' )
- .Xml::element( 'td', array(),
wfMsg( 'cvext-location-details' ) )
+ .Xml::element( 'td', array(),
wfMessage( 'cvext-location-details' )->text() )
.Xml::closeElement( 'tr' );
foreach ( $args as $name => $value )
{
@@ -331,7 +331,7 @@
// Give grep a chance to find the usages:
// cvext-dash-lcts-roomno,
cvext-dash-lcts-description, cvext-dash-lcts-url
$output .= Xml::openElement( 'tr' )
- .Xml::element( 'td',
array(), wfMsg( 'cvext-dash-lcts-' . strtolower( $name ) ) )
+ .Xml::element( 'td',
array(), wfMessage( 'cvext-dash-lcts-' . strtolower( $name ) )->text() )
.Xml::element('td',
array(), $value )
.Xml::closeElement(
'tr' );
}
--
To view, visit https://gerrit.wikimedia.org/r/252147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfbabdf3f44aa61c051825c45660bdb2990ba165
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/ConventionExtension
Gerrit-Branch: master
Gerrit-Owner: McIntireEvan <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: McIntireEvan <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
