| Index: trunk/extensions/Postcomment/Postcomment.i18n.php |
| — | — | @@ -16,8 +16,8 @@ |
| 17 | 17 | 'postcomment_addcommentdiscussionpage' => 'Add your comment on this discussion page', |
| 18 | 18 | 'postcomment_leavemessagefor' => 'Leave a message for $1', |
| 19 | 19 | 'postcomment_post' => 'Post', |
| 20 | | - 'postcomment_on' => 'On', |
| 21 | | - 'postcomment_said' => 'said', |
| | 20 | + 'postcomment_on' => 'On $1', |
| | 21 | + 'postcomment-userwrote' => '[[User:$1|$2]] wrote:', |
| 22 | 22 | 'postcomment_invalidrequest' => 'Invalid request.', |
| 23 | 23 | 'postcomment_replyto' => 'Reply to $1', |
| 24 | 24 | 'postcomment_nopostingtoadd' => 'No posting to add.', |
| — | — | @@ -34,8 +34,11 @@ |
| 35 | 35 | 'postcomment_addcommentdiscussionpage' => 'Message displayed before comment form. For example see http://www.wikihow.com/Discussion:Main-Page', |
| 36 | 36 | 'postcomment_leavemessagefor' => 'Message displayed before comment form in user talks.', |
| 37 | 37 | 'postcomment_post' => 'Name of button. For example see http://www.wikihow.com/Discussion:Main-Page', |
| 38 | | - 'postcomment_on' => '"On" as in "On <date>". For example see http://www.wikihow.com/Discussion:Main-Page', |
| 39 | | - 'postcomment_said' => '<Username> said. For example see http://www.wikihow.com/Discussion:Main-Page', |
| | 38 | + 'postcomment_on' => 'For example see http://www.wikihow.com/Discussion:Main-Page. Parameters: |
| | 39 | +* $1 is a timestamp.', |
| | 40 | + 'postcomment-usersaid' => 'This message supports GENDER. Parameters: |
| | 41 | +* $1 is a user name |
| | 42 | +* $2 is a user real name.', |
| 40 | 43 | 'postcomment_replyto' => '$1 is the user that has posted previous comment. For example see http://www.wikihow.com/Discussion:Main-Page', |
| 41 | 44 | ); |
| 42 | 45 | |
| Index: trunk/extensions/Postcomment/Postcomment.php |
| — | — | @@ -85,21 +85,17 @@ |
| 86 | 86 | } |
| 87 | 87 | $dateStr = $wgLang->timeanddate( wfTimestampNow() ); |
| 88 | 88 | |
| 89 | | - //echo "$dateStr<br />"; |
| 90 | | - |
| 91 | 89 | $formattedComment = " |
| 92 | 90 | <div id=\"discussion_entry\"><table width=\"100%\"> |
| 93 | | - <tr><td width=\"50%\" valign=\"top\" class=\"discussion_entry_user\"> |
| 94 | | - [[User:$user|$real_name]] " . wfMsg( 'postcomment_said' ) . ": |
| 95 | | -</td><td align=\"right\" width=\"50%\" class=\"discussion_entry_date\">" . wfMsg( 'postcomment_on' ) . " $dateStr<br /> |
| | 91 | + <tr><td width=\"50%\" valign=\"top\" class=\"discussion_entry_user\">" . |
| | 92 | + wfMsgExt( 'postcomment-userwrote', array( 'parsemag' ), $user, $real_name ) . " |
| | 93 | +</td><td align=\"right\" width=\"50%\" class=\"discussion_entry_date\">" . wfMsg( 'postcomment_on', $dateStr ) . "<br /> |
| 96 | 94 | </td></tr><tr> |
| 97 | 95 | <td colspan=2 class=\"discussion_entry_comment\"> |
| 98 | 96 | $comment</td></tr> |
| 99 | 97 | <tr><td colspan=\"2\" class=\"discussion_entry_date\" padding=5>[[User_talk:$user#post|" . wfMsg('postcomment_replyto', $real_name) . "]]</td></tr> |
| 100 | 98 | </table></div> |
| 101 | | - |
| 102 | 99 | "; |
| 103 | | - //echo "$formattedComment"; |
| 104 | 100 | |
| 105 | 101 | $text = ''; |
| 106 | 102 | |
| — | — | @@ -110,9 +106,6 @@ |
| 111 | 107 | |
| 112 | 108 | $text .= "\n\n$formattedComment\n\n"; |
| 113 | 109 | |
| 114 | | - //echo "updating with text:<br /> $text"; |
| 115 | | - //exit; |
| 116 | | - |
| 117 | 110 | $tmp = ""; |
| 118 | 111 | if ( $wgFilterCallback && $wgFilterCallback( $t, $text, $tmp) ) { |
| 119 | 112 | # Error messages or other handling should be performed by the filter function |