siebrand at svn
Nov 24, 2009, 9:25 AM
Post #1 of 1
(41 views)
Permalink
|
|
SVN: [59384] trunk/extensions
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59384
Revision: 59384
Author: siebrand
Date: 2009-11-24 17:25:00 +0000 (Tue, 24 Nov 2009)
Log Message:
-----------
Support GENDER for 'qp_user_polls_link' ($2) and 'qp_user_missing_polls_link' ($1)
Modified Paths:
--------------
trunk/extensions/QPoll/qp_i18n.php
trunk/extensions/QPoll/qp_results.php
trunk/extensions/Translate/check-blacklist.php
Modified: trunk/extensions/QPoll/qp_i18n.php
===================================================================
--- trunk/extensions/QPoll/qp_i18n.php 2009-11-24 17:12:29 UTC (rev 59383)
+++ trunk/extensions/QPoll/qp_i18n.php 2009-11-24 17:25:00 UTC (rev 59384)
@@ -63,8 +63,8 @@
'qp_users_link' => 'Users',
'qp_voice_link' => 'User voice',
'qp_voice_link_inv' => 'User voice?',
- 'qp_user_polls_link' => 'Participated in $1 {{PLURAL:$1|poll|polls}}',
- 'qp_user_missing_polls_link' => 'No participation',
+ 'qp_user_polls_link' => 'Participated in $1 {{PLURAL:$1|poll|polls}}', // Supports use of GENDER with $2
+ 'qp_user_missing_polls_link' => 'No participation', // Supports use of GENDER with $1
'qp_not_participated_link' => 'Not participated',
'qp_order_by_username' => 'Order by username',
'qp_order_by_polls_count' => 'Order by polls count',
@@ -130,7 +130,10 @@
'qp_users_link' => '{{Identical|User}}',
'qp_voice_link_inv' => "What '?' means?",
'qp_user_polls_link' => 'Parameters:
-* $1 is the number of polls participated in.',
+* $1 is the number of polls participated in.
+* $2 is the name of the user this message refers to (optional - use for GENDER)',
+ 'qp_user_missing_polls_link' => 'Parameters:
+* $1 is the name of the user this message refers to (optional - use for GENDER)',
);
/** Afrikaans (Afrikaans)
Modified: trunk/extensions/QPoll/qp_results.php
===================================================================
--- trunk/extensions/QPoll/qp_results.php 2009-11-24 17:12:29 UTC (rev 59383)
+++ trunk/extensions/QPoll/qp_results.php 2009-11-24 17:25:00 UTC (rev 59384)
@@ -569,8 +569,8 @@
$userName = $result->username;
$userTitle = Title::makeTitleSafe( NS_USER, $userName );
$user_link = self::$skin->link( $userTitle, $userName );
- $user_polls_link = self::$skin->link( $this->getTitle(), wfMsgExt( 'qp_user_polls_link', array( 'parsemag' ), $result->pidcount ) , array(), array( "uid"=>$uid, "action"=>"upolls" ) );
- $user_missing_polls_link = self::$skin->link( $this->getTitle(), wfMsg( 'qp_user_missing_polls_link' ) , array(), array( "uid"=>$uid, "action"=>"nupolls" ) );
+ $user_polls_link = self::$skin->link( $this->getTitle(), wfMsgExt( 'qp_user_polls_link', array( 'parsemag' ), $result->pidcount, $userName ) , array(), array( "uid"=>$uid, "action"=>"upolls" ) );
+ $user_missing_polls_link = self::$skin->link( $this->getTitle(), wfMsgExt( 'qp_user_missing_polls_link', 'parsemag', $userName ) , array(), array( "uid"=>$uid, "action"=>"nupolls" ) );
$link = $user_link . ': ' . $user_polls_link . ', ' . $user_missing_polls_link;
}
return $link;
@@ -619,7 +619,7 @@
if ( $userName !== false ) {
$userTitle = Title::makeTitleSafe( NS_USER, $userName );
$user_link = self::$skin->link( $userTitle, $userName );
- return PollResults::getPollsLink() . PollResults::getUsersLink() . '<div class="head">' . $user_link . ': ' . ( $this->inverse ? wfMsg( 'qp_user_missing_polls_link' ) : wfMsgExt( 'qp_user_polls_link', array( 'parsemag' ), $pidcount ) ) . ' ' . '</div>';
+ return PollResults::getPollsLink() . PollResults::getUsersLink() . '<div class="head">' . $user_link . ': ' . ( $this->inverse ? wfMsgExt( 'qp_user_missing_polls_link', 'parsemag', $userName ) : wfMsgExt( 'qp_user_polls_link', array( 'parsemag' ), $pidcount, $userName ) ) . ' ' . '</div>';
}
}
Modified: trunk/extensions/Translate/check-blacklist.php
===================================================================
--- trunk/extensions/Translate/check-blacklist.php 2009-11-24 17:12:29 UTC (rev 59383)
+++ trunk/extensions/Translate/check-blacklist.php 2009-11-24 17:25:00 UTC (rev 59384)
@@ -198,6 +198,14 @@
)
),
array(
+ 'group' => 'ext-qpoll',
+ 'check' => 'variable',
+ 'message' => array(
+ 'qp_user_polls_link', // Optional GENDER parameter
+ 'qp_user_missing_polls_link', // Optional GENDER parameter
+ )
+),
+array(
'group' => 'ext-regexblock',
'check' => 'variable',
'message' => array(
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
