wikimedia/mediawiki-extensions-ParserFunctions
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/ParserFunctions synced 2024-11-27 17:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ParserFunctions extension maintenance.

Browse source 
* Use Message class instead of wfMsg* methods.
* Replace additional deprecated methods.
* Fixed incorrect tag in i18n file.
* Update .gitignore.

Conflicts:
	ParserFunctions.i18n.php

Change-Id: If21300c11ec628506cb56550bc91a24a5d7c45d2
This commit is contained in:
Siebrand Mazeland 2012-09-08 01:12:24 +02:00 committed by Gerrit Code Review
parent 0a12e5e3fe
commit 5dee345880
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
*~
*.kate-swp
.*.swp
.idea

3
Expr.php
View file

@ -52,7 +52,8 @@ class ExprError extends MWException {
* @param $parameter string
*/
public function __construct( $msg, $parameter = '' ) {
$this->message = '<strong class="error">' . wfMsgForContent( "pfunc_expr_$msg", htmlspecialchars( $parameter ) ) . '</strong>';
$msg = wfMessage( "pfunc_expr_$msg", $parameter )->inContentLanguage()->escaped();
$this->message = '<strong class="error">' . $msg . '</strong>';
}
}

21
ParserFunctions_body.php
View file

@ -303,7 +303,8 @@ class ExtParserFunctions {
if ( $current == '..' ) { // removing one level
if ( !count( $newExploded ) ) {
// attempted to access a node above root node
return '<strong class="error">' . wfMsgForContent( 'pfunc_rel2abs_invalid_depth', $fullPath ) . '</strong>';
$msg = wfMessage( 'pfunc_rel2abs_invalid_depth', $fullPath )->inContentLanguage()->escaped();
return '<strong class="error">' . $msg . '</strong>';
}
// remove last level from the stack
array_pop( $newExploded );
@ -413,7 +414,8 @@ class ExtParserFunctions {
self::registerClearHook();
if ( $date === '' ) {
$cacheKey = $parser->getOptions()->getTimestamp();
$date = wfTimestamp( TS_ISO_8601, $cacheKey );
$timestamp = new MWTimestamp( $cacheKey );
$date = $timestamp->getTimestamp( TS_ISO_8601 );
} else {
$cacheKey = $date;
}
@ -463,11 +465,11 @@ class ExtParserFunctions {
# format the timestamp and return the result
if ( $invalidTime ) {
$result = '<strong class="error">' . wfMsgForContent( 'pfunc_time_error' ) . '</strong>';
$result = '<strong class="error">' . wfMessage( 'pfunc_time_error' )->inContentLanguage()->escaped() . '</strong>';
} else {
self::$mTimeChars += strlen( $format );
if ( self::$mTimeChars > self::$mMaxTimeChars ) {
return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>';
return '<strong class="error">' . wfMessage( 'pfunc_time_too_long' )->inContentLanguage()->escaped() . '</strong>';
} else {
if ( $ts < 100000000000000 ) { // Language can't deal with years after 9999
if ( $language !== '' && Language::isValidBuiltInCode( $language ) ) {
@ -479,7 +481,7 @@ class ExtParserFunctions {
$result = $parser->getFunctionLang()->sprintfDate( $format, $ts );
}
} else {
return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_big' ) . '</strong>';
return '<strong class="error">' . wfMessage( 'pfunc_time_too_big' )->inContentLanguage()->escaped() . '</strong>';
}
}
}
@ -546,12 +548,9 @@ class ExtParserFunctions {
* @return string
*/
private static function tooLongError() {
global $wgPFStringLengthLimit, $wgContLang;
return '<strong class="error">' .
wfMsgExt( 'pfunc_string_too_long',
array( 'escape', 'parsemag', 'content' ),
$wgContLang->formatNum( $wgPFStringLengthLimit ) ) .
'</strong>';
global $wgPFStringLengthLimit;
$msg = wfMessage( 'pfunc_string_too_long' )->numParams( $wgPFStringLengthLimit );
return '<strong class="error">' . $msg->inContentLanguage()->escaped() . '</strong>';
}
/**