Merge pull request #100 from FlorianSW/wfmsg-patch

Replace wfMsg* calls
ProfessionalWiki · Jan 4, 2016 · d1d3d25 · d1d3d25
2 parents 57ba401 + 91aaf69
commit d1d3d25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/includes/criteria/CriterionIsNonNumeric.php b/includes/criteria/CriterionIsNonNumeric.php
@@ -33,14 +33,14 @@ protected function doValidation( $value, Parameter $parameter, array $parameters
 	 * @see ItemParameterCriterion::getItemErrorMessage
 	 */
 	protected function getItemErrorMessage( Parameter $parameter ) {
-		return wfMsgExt( 'validation-error-no-non-numeric', 'parsemag', $parameter->getOriginalName() );
+		return wfMessage( 'validation-error-no-non-numeric', $parameter->getOriginalName() )->parse();
 	}
 
 	/**
 	 * @see ItemParameterCriterion::getFullListErrorMessage
 	 */
 	protected function getFullListErrorMessage( Parameter $parameter ) {
 		global $wgLang;
-		return wfMsgExt( 'validation-error-no-non-numerics', 'parsemag', $parameter->getOriginalName() );
+		return wfMessage( 'validation-error-no-non-numerics', $parameter->getOriginalName() )->parse();
 	}
-}
+}
diff --git a/includes/criteria/CriterionMapLayer.php b/includes/criteria/CriterionMapLayer.php
@@ -61,14 +61,14 @@ protected function doValidation( $value, Parameter $parameter, array $parameters
 	 * @see ItemParameterCriterion::getItemErrorMessage
 	 */
 	protected function getItemErrorMessage( Parameter $parameter ) {
-		return wfMsgExt( 'validation-error-invalid-layer', 'parsemag', $parameter->getOriginalName() );
+		return wfMessage( 'validation-error-invalid-layer', $parameter->getOriginalName() )->parse();
 	}
 
 	/**
 	 * @see ItemParameterCriterion::getFullListErrorMessage
 	 */
 	protected function getFullListErrorMessage( Parameter $parameter ) {
-		return wfMsgExt( 'validation-error-invalid-layers', 'parsemag', $parameter->getOriginalName() );
+		return wfMessage( 'validation-error-invalid-layers', $parameter->getOriginalName() )->parse();
 	}
 
 }
diff --git a/includes/parserhooks/Maps_LayerDefinition.php b/includes/parserhooks/Maps_LayerDefinition.php
@@ -344,9 +344,6 @@ protected function getLayerDefinitionTable( MapsLayer $layer ) {
 					count( $messages )
 				)->inContentLanguage()->escaped() .
 				"</td><td class=\"mapslayerpropval\">{$warnings}</td></tr>";
-
-
-			//$out .= $this->errorbox( wfMsgHtml( 'maps-error-invalid-layerdef' ) . $warnings );
 
 			$outWarning .= Html::rawElement(
 					'table',

diff --git a/includes/parserhooks/Maps_MapsDoc.php b/includes/parserhooks/Maps_MapsDoc.php
@@ -106,7 +106,7 @@ public function render( array $parameters ) {
 	protected function msg() {
 		$args = func_get_args();
 		$key = array_shift( $args );
-		return wfMsgReal( $key, $args, true, $this->language );
+		return wfMessage( $key, $args )->inLanguage( $this->language )->text();
 	}
 
 	/**
@@ -205,4 +205,4 @@ public function getMessage() {
 		return 'maps-mapsdoc-description';
 	}
 
-}
+}