Revision: 46264
Author: siebrand
Date: 2009-01-26 16:07:23 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
* add plural support for 'user-profile-points'
* improve i18n for 'user-count-separator'
Modified Paths:
--------------
trunk/extensions/SocialProfile/UserProfile/UserProfile.i18n.php
trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
Modified: trunk/extensions/SocialProfile/UserProfile/UserProfile.i18n.php
===================================================================
--- trunk/extensions/SocialProfile/UserProfile/UserProfile.i18n.php
2009-01-26 15:26:43 UTC (rev 46263)
+++ trunk/extensions/SocialProfile/UserProfile/UserProfile.i18n.php
2009-01-26 16:07:23 UTC (rev 46264)
@@ -16,7 +16,7 @@
'populateuserprofiles' => 'Populate user profiles',
'user-awards-title' => 'Awards',
'user-gifts-title' => 'Gifts',
- 'user-count-separator' => 'of',
+ 'user-count-separator' => '$1 of $2',
'user-view-all' => 'View all',
'user-upload-image' => 'Upload image',
'user-edit-this' => 'Edit this',
@@ -92,7 +92,7 @@
'user-profile-update-log-section' => 'changed section',
'user-profile-update-profile' => 'profile',
'user-profile-default-country' => 'United States',
- 'user-profile-points' => ' points',
+ 'user-profile-points' => '$1 {{PLURAL:$1|point|points}}',
'user-profile-section-personal' => 'Personal information',
'user-profile-section-sportsteams' => 'Update networks',
'user-profile-section-custom' => 'Custom information',
Modified: trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
===================================================================
--- trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
2009-01-26 15:26:43 UTC (rev 46263)
+++ trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
2009-01-26 16:07:23 UTC (rev 46264)
@@ -471,7 +471,7 @@
global $wgUserLevels;
if( $wgUserLevels ){
$output .= "<div id=\"points-level\">
- <a
href=\"{$level_link->escapeFullURL()}\">{$stats_data["points"]}".wfMsg('user-profile-points')."</a>
+ <a
href=\"{$level_link->escapeFullURL()}\">" . wfMsgExt( 'user-profile-points',
'parsemag', $stats_data["points"] ) . "</a>
</div>
<div id=\"honorific-level\">
<a
href=\"{$level_link->escapeFullURL()}\"
rel=\"nofollow\">({$user_level->getLevelName()})</a>
@@ -607,9 +607,9 @@
$output .= '</div>
<div class="action-left">';
if( intval( str_replace( ",",
"", $relationship_count ) ) > 4 ) {
- $output .= "{$per_row}
".wfMsg('user-count-separator')." {$relationship_count}";
+ $output .= wfMsg(
'user-count-separator', $per_row, $relationship_count );
} else {
- $output .=
"{$relationship_count} ".wfMsg('user-count-separator')." {$relationship_count}";
+ $output .= wfMsg(
'user-count-separator', $relationship_count, $relationship_count );
}
$output .= '</div>
</div>
@@ -687,9 +687,9 @@
$output .= '</div>
<div class="action-left">';
if( $gift_count > 4 ) {
- $output .= "4
".wfMsg('user-count-separator')." {$gift_count}";
+ $output .= wfMsg(
'user-count-separator', "4", $gift_count );
} else {
- $output .=
"{$gift_count} ".wfMsg('user-count-separator')." {$gift_count}";
+ $output .= wfMsg(
'user-count-separator', $gift_count, $gift_count );
}
$output .= '</div>
<div class="cleared"></div>
@@ -770,9 +770,9 @@
$output .= '</div>
<div class="action-left">';
if( $system_gift_count > 4 ) {
- $output .= "4
".wfMsg('user-count-separator')." {$system_gift_count}";
+ $output .= wfMsg(
'user-count-separator', "4", $system_gift_count );
} else {
- $output .=
"{$system_gift_count} ".wfMsg('user-count-separator')." {$system_gift_count}";
+ $output .= wfMsg(
'user-count-separator', $system_gift_count, $system_gift_count );
}
$output .= "</div>
<div class=\"cleared\"></div>
@@ -846,9 +846,9 @@
$output .= '</div>
<div class="action-left">';
if( $total > 10 ) {
- $output .= "10
".wfMsg('user-count-separator')." {$total}";
+ $output .= wfMsg(
'user-count-separator', "10", $total );
} else if( $total > 0 ) {
- $output .= "{$total}
".wfMsg('user-count-separator')." {$total}";
+ $output .= wfMsg(
'user-count-separator', $total, $total );
}
$output .= '</div>
<div class="cleared"></div>
@@ -939,9 +939,9 @@
$output .= '</div>
<div class="action-left">';
if( $fanbox_count > 10 ) {
- $output .= "10
".wfMsg('user-count-separator')." {$fanbox_count}";
+ $output .=
wfMsg('user-count-separator', "10", $fanbox_count );
} else {
- $output .=
"{$fanbox_count} ".wfMsg('user-count-separator')." {$fanbox_count}";
+ $output .= wfMsg(
'user-count-separator',$fanbox_count, $fanbox_count);
}
$output .= '</div>
<div class="cleared"></div>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
