Smuggli has submitted this change and it was merged.

Change subject: Deprecated wfMsg, wfMsgForContent, wfMsgExt
......................................................................


Deprecated wfMsg, wfMsgForContent, wfMsgExt

using wfMessage like described on
https://www.mediawiki.org/wiki/Manual:Messages_API
related to https://gerrit.wikimedia.org/r/#/c/146441/

Change-Id: I3decf5990b9ee5755f9430d337d8ef533cd28e8d
---
M InsertFile/includes/JsonLicenses.php
M Statistics/includes/DiagramEditsPerUser.class.php
M Statistics/includes/DiagramNumberOfArticles.class.php
M Statistics/includes/DiagramNumberOfEdits.class.php
M Statistics/includes/DiagramNumberOfPages.class.php
M Statistics/includes/DiagramNumberOfUsers.class.php
M Statistics/includes/DiagramSearches.class.php
M Statistics/includes/FilterCategory.class.php
M Statistics/includes/FilterNamespace.class.php
M Statistics/includes/FilterSearchScope.class.php
M Statistics/includes/FilterUsers.class.php
M Statistics/includes/MultiSelectFilter.class.php
M UniversalExport/includes/specials/SpecialUniversalExport.class.php
M WantedArticle/includes/ViewWantedArticleTag.php
M WatchList/WatchList.class.php
M WidgetBar/views/view.WidgetList.php
16 files changed, 68 insertions(+), 64 deletions(-)

Approvals:
  Smuggli: Verified; Looks good to me, approved



diff --git a/InsertFile/includes/JsonLicenses.php 
b/InsertFile/includes/JsonLicenses.php
index 392c08d..197e37e 100644
--- a/InsertFile/includes/JsonLicenses.php
+++ b/InsertFile/includes/JsonLicenses.php
@@ -2,9 +2,9 @@
 
 /**
  * JsonLicenses
- * 
+ *
  * Extends the mediawiki licenses class to put the available licenses out in a 
json format for ExtJS combobox.
- * 
+ *
  * @author Sebastian Ulbricht
  */
 class JsonLicenses extends Licenses {
@@ -16,7 +16,7 @@
        }
 
        public function getJsonOutput() {
-               $this->json[] = $this->outputJsonOption( wfMsg( 'nolicense' ), 
'' );
+               $this->json[] = $this->outputJsonOption( wfMessage( 'nolicense' 
)->text(), '' );
                $this->makeJson( $this->getLicenses() );
                return json_encode(array('items' => $this->json));
        }
@@ -24,7 +24,7 @@
        protected function outputJsonOption( $text, $value, $depth = 0 ) {
                return array(
                        'text' => $text,
-                       'value' => "\n\n==".wfMsgForContent( 'license-header' 
)."==\n{{".$value."}}",
+                       'value' => "\n\n==".  wfMessage( 'license-header' 
)->inContentLanguage()->text()."==\n{{".$value."}}",
                        'indent'=> $depth
                );
        }
diff --git a/Statistics/includes/DiagramEditsPerUser.class.php 
b/Statistics/includes/DiagramEditsPerUser.class.php
index 11515db..1e3122d 100644
--- a/Statistics/includes/DiagramEditsPerUser.class.php
+++ b/Statistics/includes/DiagramEditsPerUser.class.php
@@ -16,7 +16,7 @@
 /**
  * Describes edits per user for Statistics for BlueSpice.
  * @package    BlueSpice_Extensions
- * @subpackage Statistics 
+ * @subpackage Statistics
  */
 class BsDiagramEditsPerUser extends BsDiagram {
 
@@ -26,10 +26,10 @@
        public function __construct() {
                parent::__construct();
 
-               $this->sTitle = wfMsg( 'bs-statistics-diag-edits-per-user');
-               $this->sDescription = wfMsg( 
'bs-statistics-diag-edits-per-user-desc');
-               $this->sTitlex = wfMsg( 'bs-statistics-label-time');
-               $this->sTitley = wfMsg( 'bs-statistics-label-count');
+               $this->sTitle = wfMessage( 
'bs-statistics-diag-edits-per-user')->text();
+               $this->sDescription = wfMessage( 
'bs-statistics-diag-edits-per-user-desc')->text();
+               $this->sTitlex = wfMessage( 'bs-statistics-label-time')->text();
+               $this->sTitley = wfMessage( 
'bs-statistics-label-count')->text();
                $this->sActualGrain = "m";
                $this->sModLabel = "M";
                $this->sFormatX = "%01.1f";
@@ -64,7 +64,7 @@
                                                                                
        )
                                                                                
        AND NOT user_name IN (@BsFilterUsers)
                                                                        ) as y";
-               //$this->sListLabel = array(wfMsg( 'label-article'), wfMsg( 
'label-creator'));
+               //$this->sListLabel = array(wfMessage( 
'label-article')->text(), wfMessage( 'label-creator')->text());
                $this->sMode = BsDiagram::MODE_ABSOLUTE;
 
                $this->addFilter( new BsFilterNamespace( $this, array( 0 ) ) );
diff --git a/Statistics/includes/DiagramNumberOfArticles.class.php 
b/Statistics/includes/DiagramNumberOfArticles.class.php
index 4e4ab0b..b3956a6 100644
--- a/Statistics/includes/DiagramNumberOfArticles.class.php
+++ b/Statistics/includes/DiagramNumberOfArticles.class.php
@@ -16,7 +16,7 @@
 /**
  * Describes number of articles for Statistics for BlueSpice.
  * @package    BlueSpice_Extensions
- * @subpackage Statistics 
+ * @subpackage Statistics
  */
 class BsDiagramNumberOfArticles extends BsDiagram {
 
@@ -26,10 +26,10 @@
        public function __construct() {
                parent::__construct();
 
-               $this->sTitle = wfMsg( 'bs-statistics-diag-number-of-pages-mw');
-               $this->sDescription = wfMsg( 
'bs-statistics-diag-number-of-pages-mw-desc');
-               $this->sTitlex = wfMsg( 'bs-statistics-label-time');
-               $this->sTitley = wfMsg( 'bs-statistics-label-count');
+               $this->sTitle = wfMessage( 
'bs-statistics-diag-number-of-pages-mw')->text();
+               $this->sDescription = wfMessage( 
'bs-statistics-diag-number-of-pages-mw-desc')->text();
+               $this->sTitlex = wfMessage( 'bs-statistics-label-time')->text();
+               $this->sTitley = wfMessage( 
'bs-statistics-label-count')->text();
                $this->sActualGrain = "m";
                $this->sModLabel = "M";
                $this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
@@ -74,7 +74,7 @@
                                                                        )
                                                                )
                                                                AND 
@BsFilterCategory";
-               $this->sListLabel = array( wfMsg( 
'bs-statistics-label-article'), wfMsg( 'bs-statistics-label-creator'));
+               $this->sListLabel = array( wfMessage( 
'bs-statistics-label-article')->text(), wfMessage( 
'bs-statistics-label-creator')->text() );
                $this->sMode = BsDiagram::MODE_AGGREGATED;
 
                $this->addFilter( new BsFilterNamespace( $this, array( 0 ) ) );
diff --git a/Statistics/includes/DiagramNumberOfEdits.class.php 
b/Statistics/includes/DiagramNumberOfEdits.class.php
index 69a70f1..2c9788a 100644
--- a/Statistics/includes/DiagramNumberOfEdits.class.php
+++ b/Statistics/includes/DiagramNumberOfEdits.class.php
@@ -16,7 +16,7 @@
 /**
  * Describes number of edits for Statistics for BlueSpice.
  * @package    BlueSpice_Extensions
- * @subpackage Statistics 
+ * @subpackage Statistics
  */
 class BsDiagramNumberOfEdits extends BsDiagram {
 
@@ -26,10 +26,10 @@
        public function __construct() {
                parent::__construct();
 
-               $this->sTitle = wfMsg( 'bs-statistics-diag-number-of-edits');
-               $this->sDescription = wfMsg( 
'bs-statistics-diag-number-of-edits-desc');
-               $this->sTitlex = wfMsg( 'bs-statistics-label-time');
-               $this->sTitley = wfMsg( 'bs-statistics-label-count');
+               $this->sTitle = wfMessage( 
'bs-statistics-diag-number-of-edits')->text();
+               $this->sDescription = wfMessage( 
'bs-statistics-diag-number-of-edits-desc')->text();
+               $this->sTitlex = wfMessage( 'bs-statistics-label-time')->text();
+               $this->sTitley = wfMessage( 
'bs-statistics-label-count')->text();
                $this->sActualGrain = "m";
                $this->sModLabel = "M";
                $this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
@@ -52,7 +52,7 @@
                                                                )
                                                                AND NOT 
rev_user_text IN (@BsFilterUsers)
                                                                AND 
@BsFilterCategory";
-               //$this->sListLabel = array(wfMsg( 'label-article'), wfMsg( 
'label-creator'));
+               //$this->sListLabel = array(wfMessage( 
'label-article')->text(), wfMessage( 'label-creator')->text());
                $this->sMode = BsDiagram::MODE_ABSOLUTE;
 
                $this->addFilter( new BsFilterNamespace( $this, array( 0 ) ) );
diff --git a/Statistics/includes/DiagramNumberOfPages.class.php 
b/Statistics/includes/DiagramNumberOfPages.class.php
index 46fc1d8..4d74a4b 100644
--- a/Statistics/includes/DiagramNumberOfPages.class.php
+++ b/Statistics/includes/DiagramNumberOfPages.class.php
@@ -16,7 +16,7 @@
 /**
  * Describes number of pages for Statistics for BlueSpice.
  * @package    BlueSpice_Extensions
- * @subpackage Statistics 
+ * @subpackage Statistics
  */
 class BsDiagramNumberOfPages extends BsDiagram {
 
@@ -26,17 +26,17 @@
        public function __construct() {
                parent::__construct();
 
-               $this->sTitle = wfMsg( 'bs-statistics-diag-number-of-pages');
-               $this->sDescription = wfMsg( 
'bs-statistics-diag-number-of-pages-desc');
-               $this->sTitlex = wfMsg( 'bs-statistics-label-time');
-               $this->sTitley = wfMsg( 'bs-statistics-label-count');
+               $this->sTitle = wfMessage( 
'bs-statistics-diag-number-of-pages')->text();
+               $this->sDescription = wfMessage( 
'bs-statistics-diag-number-of-pages-desc')->text();
+               $this->sTitlex = wfMessage( 'bs-statistics-label-time')->text();
+               $this->sTitley = wfMessage( 
'bs-statistics-label-count')->text();
                $this->sActualGrain = "m";
                $this->sModLabel = "M";
                $this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
                $this->bListable = true;
                $this->sSqlWhatForDiagram = "count(DISTINCT rev_page)";
                $this->sSqlWhatForList = "DISTINCT page_title, rev_user_text";
-               $this->sSqlFromWhere = "FROM #__revision AS a 
+               $this->sSqlFromWhere = "FROM #__revision AS a
                                                                        JOIN 
#__page ON #__page.page_id = a.rev_page
                                                                        LEFT 
JOIN #__categorylinks AS c ON c.cl_from = a.rev_page
                                                                WHERE 
rev_timestamp @period
@@ -47,7 +47,7 @@
                                                                )
                                                                AND 
@BsFilterNamespace
                                                                AND 
@BsFilterCategory";
-               $this->sListLabel = array( wfMsg( 
'bs-statistics-label-article'), wfMsg( 'bs-statistics-label-creator') );
+               $this->sListLabel = array( wfMessage( 
'bs-statistics-label-article')->text(), wfMessage( 
'bs-statistics-label-creator')->text() );
                $this->sMode = BsDiagram::MODE_AGGREGATED;
 
                $this->addFilter( new BsFilterNamespace( $this, array( 0 ) ) );
diff --git a/Statistics/includes/DiagramNumberOfUsers.class.php 
b/Statistics/includes/DiagramNumberOfUsers.class.php
index 8d069ce..27ba12d 100644
--- a/Statistics/includes/DiagramNumberOfUsers.class.php
+++ b/Statistics/includes/DiagramNumberOfUsers.class.php
@@ -27,10 +27,10 @@
                parent::__construct();
 
                BsConfig::get( 'MW::Statistics::ExcludeUsers' );
-               $this->sTitle = wfMsg( 'bs-statistics-diag-number-of-users');
-               $this->sDescription = wfMsg( 
'bs-statistics-diag-number-of-users-desc');
-               $this->sTitlex = wfMsg( 'bs-statistics-label-time');
-               $this->sTitley = wfMsg( 'bs-statistics-label-count');
+               $this->sTitle = wfMessage( 
'bs-statistics-diag-number-of-users')->text();
+               $this->sDescription = wfMessage( 
'bs-statistics-diag-number-of-users-desc')->text();
+               $this->sTitlex = wfMessage( 'bs-statistics-label-time')->text();
+               $this->sTitley = wfMessage( 
'bs-statistics-label-count')->text();
                $this->sActualGrain = "m";
                $this->sModLabel = "M";
                $this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
@@ -45,7 +45,7 @@
                                                                        WHERE 
ug_group = 'bot'
                                                                )
                                                                AND NOT 
user_name IN (@BsFilterUsers)";
-               $this->sListLabel = array( wfMsg( 'bs-statistics-label-name'), 
wfMsg( 'bs-statistics-label-registration') );
+               $this->sListLabel = array( wfMessage( 
'bs-statistics-label-name')->text(), wfMessage( 
'bs-statistics-label-registration')->text() );
                $this->sMode = BsDiagram::MODE_AGGREGATED;
 
                $this->addFilter( new BsFilterUsers( $this ) );
diff --git a/Statistics/includes/DiagramSearches.class.php 
b/Statistics/includes/DiagramSearches.class.php
index 0111436..9f521c0 100644
--- a/Statistics/includes/DiagramSearches.class.php
+++ b/Statistics/includes/DiagramSearches.class.php
@@ -16,7 +16,7 @@
 /**
  * Describes search query diagram for Statistics for BlueSpice.
  * @package    BlueSpice_Extensions
- * @subpackage Statistics 
+ * @subpackage Statistics
  */
 class BsDiagramSearches extends BsDiagram {
 
@@ -26,10 +26,10 @@
        public function __construct() {
                parent::__construct();
 
-               $this->sTitle = wfMsg( 'bs-statistics-diag-search-queries');
-               $this->sDescription = wfMsg( 
'bs-statistics-diag-search-queries-desc');
-               $this->sTitlex = wfMsg( 'bs-statistics-label-time');
-               $this->sTitley = wfMsg( 'bs-statistics-label-count');
+               $this->sTitle = wfMessage( 
'bs-statistics-diag-search-queries')->text();
+               $this->sDescription = wfMessage( 
'bs-statistics-diag-search-queries-desc')->text();
+               $this->sTitlex = wfMessage( 'bs-statistics-label-time')->text();
+               $this->sTitley = wfMessage( 
'bs-statistics-label-count')->text();
                $this->sActualGrain = "m";
                $this->sModLabel = "M";
                $this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
@@ -38,7 +38,11 @@
                $this->sSqlWhatForList = "stats_term, count(stats_term) as x, 
max(stats_hits)";
                $this->sSqlFromWhere = "FROM #__bs_searchstats WHERE stats_ts 
@period AND @BsFilterSearchScope";
                $this->sSqlOptionsForList = "GROUP BY stats_term";
-               $this->sListLabel = array( wfMsg( 
'bs-statistics-label-searchterm' ), wfMsg( 'bs-statistics-label-count' ), 
wfMsg( 'bs-statistics-label-maxhits' ) );
+               $this->sListLabel = array(
+                       wfMessage( 'bs-statistics-label-searchterm' )->text(),
+                       wfMessage( 'bs-statistics-label-count' )->text(),
+                       wfMessage( 'bs-statistics-label-maxhits' )->text()
+               );
                $this->sMode = BsDiagram::MODE_AGGREGATED;
 
                $this->addFilter( new BsFilterSearchScope( $this, array( 
"title" ) ) );
diff --git a/Statistics/includes/FilterCategory.class.php 
b/Statistics/includes/FilterCategory.class.php
index 499401b..8e276a8 100644
--- a/Statistics/includes/FilterCategory.class.php
+++ b/Statistics/includes/FilterCategory.class.php
@@ -28,7 +28,7 @@
        public function __construct( $oDiagram, $aDefaultValues = null ) {
                parent::__construct( $oDiagram, $aDefaultValues );
 
-               $this->sLabel = wfMsg( 'bs-statistics-filter-category' );
+               $this->sLabel = wfMessage( 'bs-statistics-filter-category' 
)->text();
                $this->aAvailableValues = $this->loadAvailableValues();
                $this->aDefaultValues = array();
        }
@@ -67,7 +67,7 @@
        public function loadAvailableValues() {
                $aCategories = array();
                // TODO MRG (20.02.11 23:51): i18n geht noch nicht so recht
-               $aCategories[wfMsg( 'bs-statistics-all-categories' )] = '(all)';
+               $aCategories[wfMessage( 'bs-statistics-all-categories' 
)->text()] = '(all)';
                // TODO MRG (22.12.10 01:19): Greift auf MW zu
                $oDbr = wfGetDB( DB_SLAVE );
                $rRes = $oDbr->select('categorylinks', 'distinct cl_to', '', 
'', array('ORDER BY' => 'cl_to ASC') );
diff --git a/Statistics/includes/FilterNamespace.class.php 
b/Statistics/includes/FilterNamespace.class.php
index 9fe898d..a204227 100644
--- a/Statistics/includes/FilterNamespace.class.php
+++ b/Statistics/includes/FilterNamespace.class.php
@@ -27,7 +27,7 @@
        public function __construct( $oDiagram, $aDefaultValues ) {
                parent::__construct( $oDiagram, $aDefaultValues );
 
-               $this->sLabel = wfMsg( 'bs-statistics-filter-namespace' );
+               $this->sLabel = wfMessage( 'bs-statistics-filter-namespace' 
)->text();
                $this->aAvailableValues = $this->loadAvailableValues();
                $this->aDefaultValues = array( 0 );
        }
diff --git a/Statistics/includes/FilterSearchScope.class.php 
b/Statistics/includes/FilterSearchScope.class.php
index b00740d..b3cdaaa 100644
--- a/Statistics/includes/FilterSearchScope.class.php
+++ b/Statistics/includes/FilterSearchScope.class.php
@@ -28,7 +28,7 @@
        public function __construct( $oDiagram, $aDefaultValues ) {
                parent::__construct( $oDiagram, $aDefaultValues );
 
-               $this->sLabel = wfMsg( 'bs-statistics-filter-searchscope' );
+               $this->sLabel = wfMessage( 'bs-statistics-filter-searchscope' 
)->text();
                $this->aAvailableValues = array( 'title', 'text', 'files', 
'all' );
                $this->aDefaultValues = array( 'all' );
        }
diff --git a/Statistics/includes/FilterUsers.class.php 
b/Statistics/includes/FilterUsers.class.php
index ff6ce5c..42ad0eb 100644
--- a/Statistics/includes/FilterUsers.class.php
+++ b/Statistics/includes/FilterUsers.class.php
@@ -28,7 +28,7 @@
        public function __construct( $oDiagram, $aDefaultValues = null ) {
                parent::__construct( $oDiagram, $aDefaultValues );
 
-               $this->sLabel = wfMsg( 'bs-statistics-filter-user' );
+               $this->sLabel = wfMessage( 'bs-statistics-filter-user' 
)->text();
                $this->aAvailableValues = $this->loadAvailableValues();
                $this->aDefaultValues = BsConfig::get( 
'MW::Statistics::ExcludeUsers' );
        }
diff --git a/Statistics/includes/MultiSelectFilter.class.php 
b/Statistics/includes/MultiSelectFilter.class.php
index 2b1b5bf..1466099 100644
--- a/Statistics/includes/MultiSelectFilter.class.php
+++ b/Statistics/includes/MultiSelectFilter.class.php
@@ -48,7 +48,7 @@
                $this->getActiveValues();
                $aI18NValues = array();
                foreach ( $this->aActiveValues as $sValue ) {
-                       $sValueText = preg_replace( 
"/^(<|&lt;)?(.*?)(>|&gt;)?$/", "$2", wfMsg( $sValue ) );
+                       $sValueText = preg_replace( 
"/^(<|&lt;)?(.*?)(>|&gt;)?$/", "$2", wfMessage( $sValue )->text() );
                        $aI18NValues[] = $sValueText;
                }
                return implode( ", ", $aI18NValues );
diff --git a/UniversalExport/includes/specials/SpecialUniversalExport.class.php 
b/UniversalExport/includes/specials/SpecialUniversalExport.class.php
index ae9e094..e36b337 100644
--- a/UniversalExport/includes/specials/SpecialUniversalExport.class.php
+++ b/UniversalExport/includes/specials/SpecialUniversalExport.class.php
@@ -110,7 +110,7 @@
                                throw new Exception( 
'error-requested-title-does-not-exist' );
                        }*/
 
-                       //Get relevant page props 
+                       //Get relevant page props
                        $dbr = wfGetDB( DB_SLAVE );
                        $res = $dbr->selectField(
                                'page_props',
@@ -129,7 +129,7 @@
                                        );
                                }
                        }
-                       
+
                        BsUniversalExportHelper::getParamsFromQueryString( 
$this->aParams );
 
                        if ( $this->oRequestedTitle->userCan( 
'universalexport-export' ) === false ) {
@@ -159,7 +159,7 @@
                }
                catch( Exception $oException ) {
                        //Display Exception-Message and Stacktrace
-                       $this->oOutputPage->setPageTitle( wfMsg( 
'bs-universalexport-page-title-on-error' ) );
+                       $this->oOutputPage->setPageTitle( wfMessage( 
'bs-universalexport-page-title-on-error' )->text() );
                        $oExceptionView = new ViewException( $oException );
                        $this->oOutputPage->addHtml( $oExceptionView->execute() 
);
                }
@@ -170,12 +170,12 @@
         */
        private function outputInformation() {
                // TODO RBV (14.12.10 09:59): Display information about 
WebService availability, configuration settings, etc... Could also be used to 
monitor Webservice and manually empty cache.
-               $this->oOutputPage->setPageTitle( wfMsg( 
'bs-universalexport-page-title-without-param' ) );
-               $this->oOutputPage->addHtml( wfMsg( 
'bs-universalexport-page-text-without-param' ) );
+               $this->oOutputPage->setPageTitle( wfMessage( 
'bs-universalexport-page-title-without-param' )->text() );
+               $this->oOutputPage->addHtml( wfMessage( 
'bs-universalexport-page-text-without-param' )->text() );
                $this->oOutputPage->addHtml( '<hr />' );
 
                if( empty( $this->aModules ) ){
-                       $this->oOutputPage->addHtml( wfMsg( 
'bs-universalexport-page-text-without-param-no-modules-registered' ) );
+                       $this->oOutputPage->addHtml( wfMessage( 
'bs-universalexport-page-text-without-param-no-modules-registered' )->text() );
                        return;
                }
 
diff --git a/WantedArticle/includes/ViewWantedArticleTag.php 
b/WantedArticle/includes/ViewWantedArticleTag.php
index 6e04076..b2d6ac7 100644
--- a/WantedArticle/includes/ViewWantedArticleTag.php
+++ b/WantedArticle/includes/ViewWantedArticleTag.php
@@ -35,7 +35,7 @@
                                                .' 
data-count="'.$this->mCount.'"'
                                                .' 
data-order="'.$this->mOrder.'"'
                                                .' 
data-sort="'.$this->mSort.'"';
-               
+
                foreach( $this->mListEntries as $oTitle ){
                        $sLink = sprintf( '<a class="internal %s" href="%s" 
title="%s">%s</a>',
                                $oTitle->exists() == false ? 'new' : '',
@@ -73,9 +73,9 @@
                if( !empty ( $aHiddenList ) ) {
                        if( $this->mType == 'queue' ) {
                                $aOut[] = sprintf( ', <a 
class="togglemore-queue" href="javascript:void(0);" title="%s">%s</a>',
-                                               wfMsg( 
'bs-wantedarticle-tag-more-linktext' ),
-                                               wfMsg( 
'bs-wantedarticle-tag-more-linktext' )
-                                               );
+                                       wfMessage( 
'bs-wantedarticle-tag-more-linktext' )->text(),
+                                       wfMessage( 
'bs-wantedarticle-tag-more-linktext' )->text()
+                               );
                                $aOut[] = '<span style="display:none">';
                                $aOut[] = '<span 
class="bs-wantedarticle-suggestion">';
                                $aOut[] = implode( '</span>, <span 
class="bs-wantedarticle-suggestion">', $aHiddenList );
@@ -84,9 +84,9 @@
                        }
                        else {
                                $aOut[] = sprintf( '<a class="togglemore" 
href="javascript:void(0)" title="%s">%s</a>',
-                                               wfMsg( 
'bs-wantedarticle-tag-more-linktext' ),
-                                               wfMsg( 
'bs-wantedarticle-tag-more-linktext' )
-                                               );
+                                       wfMessage( 
'bs-wantedarticle-tag-more-linktext' )->text(),
+                                       wfMessage( 
'bs-wantedarticle-tag-more-linktext' )->text()
+                               );
                                $aOut[] = '<ul style="display:none">';
                                $aOut[] = '  <li 
class="bs-wantedarticle-suggestion">';
                                $aOut[] = implode( '</li><li 
class="bs-wantedarticle-suggestion">', $aHiddenList );
@@ -94,7 +94,7 @@
                                $aOut[] = '</ul>';
                        }
                }
-               
+
                $aOut[] = '</div>';
                return implode( "\n", $aOut);
        }
diff --git a/WatchList/WatchList.class.php b/WatchList/WatchList.class.php
index 0afa193..d03415c 100644
--- a/WatchList/WatchList.class.php
+++ b/WatchList/WatchList.class.php
@@ -146,14 +146,14 @@
                $oValidationICount = BsValidator::isValid( 'IntegerRange', 
$iCount, array('fullResponse' => true, 'lowerBoundary' => 1, 'upperBoundary' => 
1000) );
                if ( $oValidationICount->getErrorCode() ) {
                        $oErrorListView->addItem(
-                               new ViewTagError( 'count: '.wfMsg( 
$oValidationICount->getI18N() ) )
+                               new ViewTagError( 'count: '.wfMessage( 
$oValidationICount->getI18N() )->text() )
                        );
                }
 
                $oValidationIMaxTitleLength = BsValidator::isValid( 
'IntegerRange', $iMaxTitleLength, array('fullResponse' => true, 'lowerBoundary' 
=> 5, 'upperBoundary' => 500) );
                if ( $oValidationIMaxTitleLength->getErrorCode() ) {
                        $oErrorListView->addItem(
-                               new ViewTagError( 'maxtitlelength: '.wfMsg( 
$oValidationIMaxTitleLength->getI18N() ) )
+                               new ViewTagError( 'maxtitlelength: '.wfMessage( 
$oValidationIMaxTitleLength->getI18N() )->text() )
                        );
                }
 
diff --git a/WidgetBar/views/view.WidgetList.php 
b/WidgetBar/views/view.WidgetList.php
index 59a05f9..0938861 100644
--- a/WidgetBar/views/view.WidgetList.php
+++ b/WidgetBar/views/view.WidgetList.php
@@ -21,10 +21,10 @@
 
                $aOut = array();
                $aOut[] = '<div id="bs-widget-container" >';
-               $aOut[] = '  <div class="icon-plus" id="bs-widget-tab" title="' 
. wfMsg( 'bs-widget-container-tooltip' ) . '" tabindex="100">[+/-]</div>';
+               $aOut[] = '  <div class="icon-plus" id="bs-widget-tab" title="' 
. wfMessage( 'bs-widget-container-tooltip' )->text() . '" 
tabindex="100">[+/-]</div>';
                $aOut[] = '  <div id="bs-flyout">';
                $aOut[] = '    <div id="bs-flyout-top"></div>';
-               $aOut[] = '    <h4 id="bs-flyout-heading">' . wfMsg( 
'bs-widget-flyout-heading' ) . '</h4>';
+               $aOut[] = '    <h4 id="bs-flyout-heading">' . wfMessage( 
'bs-widget-flyout-heading' )->text() . '</h4>';
                $aOut[] = $sEditLink;
                $aOut[] = '    <div id="bs-flyout-content">';
 

-- 
To view, visit https://gerrit.wikimedia.org/r/146449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3decf5990b9ee5755f9430d337d8ef533cd28e8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Swidmann <widm...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Smuggli <mug...@hallowelt.biz>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to