| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4630,18 +4630,18 @@ |
| 4631 | 4631 | 'newuserlog-byemail' => 'password sent by e-mail', |
| 4632 | 4632 | |
| 4633 | 4633 | # Feedback |
| 4634 | | -'feedback-note' => 'This form publicly posts a simple comment or suggestion to the page "[$2 $1]", along with your user name, browser version and operating system.', |
| 4635 | | -'feedback-bugnote' => 'Or, you can [$1 post a technical bug report] instead.', |
| 4636 | | -'feedback-subject' => 'Subject:', |
| 4637 | | -'feedback-message' => 'Message:', |
| 4638 | | -'feedback-cancel' => 'Cancel', |
| 4639 | | -'feedback-submit' => 'Submit Feedback', |
| 4640 | | -'feedback-adding' => 'Adding feedback to page...', |
| 4641 | | -'feedback-error1' => 'Error: Unrecognized result from API', |
| 4642 | | -'feedback-error2' => 'Error: Edit failed', |
| 4643 | | -'feedback-error3' => 'Error: No response from API', |
| 4644 | | -'feedback-thanks' => 'Thanks! Your feedback has been posted to the page "[$2 $1]".', |
| 4645 | | -'feedback-close' => 'Done', |
| | 4634 | +'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug]. |
| | 4635 | +Otherwise, you can use the easy form below. Your comment will be added to the page "[$3 $2]", along with your username and what browser you are using.', |
| | 4636 | +'feedback-subject' => 'Subject:', |
| | 4637 | +'feedback-message' => 'Message:', |
| | 4638 | +'feedback-cancel' => 'Cancel', |
| | 4639 | +'feedback-submit' => 'Submit Feedback', |
| | 4640 | +'feedback-adding' => 'Adding feedback to page...', |
| | 4641 | +'feedback-error1' => 'Error: Unrecognized result from API', |
| | 4642 | +'feedback-error2' => 'Error: Edit failed', |
| | 4643 | +'feedback-error3' => 'Error: No response from API', |
| | 4644 | +'feedback-thanks' => 'Thanks! Your feedback has been posted to the page "[$2 $1]".', |
| | 4645 | +'feedback-close' => 'Done', |
| 4646 | 4646 | 'feedback-bugcheck' => 'Great! Just check that it is not already one of the [$1 known bugs].', |
| 4647 | 4647 | 'feedback-bugnew' => 'I checked. Report a new bug', |
| 4648 | 4648 | |
| Index: trunk/phase3/resources/Resources.php |
| — | — | @@ -538,8 +538,7 @@ |
| 539 | 539 | 'jquery.ui.dialog', |
| 540 | 540 | ), |
| 541 | 541 | 'messages' => array( |
| 542 | | - 'feedback-note', |
| 543 | | - 'feedback-bugnote', |
| | 542 | + 'feedback-bugornote', |
| 544 | 543 | 'feedback-subject', |
| 545 | 544 | 'feedback-message', |
| 546 | 545 | 'feedback-cancel', |
| Index: trunk/phase3/resources/mediawiki/mediawiki.feedback.js |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | .attr( { 'href': _this.title.getUrl(), 'target': '_blank' } ) |
| 79 | 79 | .css( { 'white-space': 'nowrap' } ); |
| 80 | 80 | |
| 81 | | - var $bugNoteLink = $( '<a></a>' ).attr( { 'href': '#', } ).click( function() { _this.displayBugs(); } ); |
| | 81 | + var $bugNoteLink = $( '<a></a>' ).attr( { 'href': '#' } ).click( function() { _this.displayBugs(); } ); |
| 82 | 82 | |
| 83 | 83 | var $bugsListLink = $( '<a></a>' ).attr( { 'href': _this.bugsListLink, 'target': '_blank' } ); |
| 84 | 84 | |
| — | — | @@ -86,11 +86,11 @@ |
| 87 | 87 | $( '<div class="feedback-mode feedback-form"></div>' ).append( |
| 88 | 88 | $( '<small></small>' ).append( |
| 89 | 89 | $( '<p></p>' ).msg( |
| 90 | | - 'feedback-note', |
| | 90 | + 'feedback-bugornote', |
| | 91 | + $bugNoteLink, |
| 91 | 92 | _this.title.getNameText(), |
| 92 | 93 | $feedbackPageLink.clone() |
| 93 | | - ), |
| 94 | | - $( '<p></p>' ).msg( 'feedback-bugnote', $bugNoteLink ) |
| | 94 | + ) |
| 95 | 95 | ), |
| 96 | 96 | $( '<div style="margin-top:1em;"></div>' ).append( |
| 97 | 97 | mw.msg( 'feedback-subject' ), |