From 7047be59eb3afcff1d8f5a91f5906d6d9b1c2167 Mon Sep 17 00:00:00 2001
From: Neil Kandalgaonkar <neilk@users.mediawiki.org>
Date: Thu, 15 Dec 2011 02:06:47 +0000
Subject: [PATCH] put bugzilla link and description into one string
 (description of form closer to the form itself). Fix misplaced comma.

---
 languages/messages/MessagesEn.php         | 24 +++++++++++------------
 resources/Resources.php                   |  3 +--
 resources/mediawiki/mediawiki.feedback.js |  8 ++++----
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ed75c4c16f..f1ef85536b 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4630,18 +4630,18 @@ This site is experiencing technical difficulties.',
 'newuserlog-byemail'                  => 'password sent by e-mail',
 
 # Feedback
-'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.',
-'feedback-bugnote'  => 'Or, you can [$1 post a technical bug report] instead.',
-'feedback-subject'  => 'Subject:',
-'feedback-message'  => 'Message:',
-'feedback-cancel'   => 'Cancel',
-'feedback-submit'   => 'Submit Feedback',
-'feedback-adding'   => 'Adding feedback to page...',
-'feedback-error1'   => 'Error: Unrecognized result from API',
-'feedback-error2'   => 'Error: Edit failed',
-'feedback-error3'   => 'Error: No response from API',
-'feedback-thanks'   => 'Thanks! Your feedback has been posted to the page "[$2 $1]".',
-'feedback-close'    => 'Done',
+'feedback-bugornote' => 'If you are ready to describe a technical problem in detail please [$1 report a bug]. 
+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.',
+'feedback-subject' => 'Subject:',
+'feedback-message' => 'Message:',
+'feedback-cancel' => 'Cancel',
+'feedback-submit' => 'Submit Feedback',
+'feedback-adding' => 'Adding feedback to page...',
+'feedback-error1' => 'Error: Unrecognized result from API',
+'feedback-error2' => 'Error: Edit failed',
+'feedback-error3' => 'Error: No response from API',
+'feedback-thanks' => 'Thanks! Your feedback has been posted to the page "[$2 $1]".',
+'feedback-close' => 'Done',
 'feedback-bugcheck' => 'Great! Just check that it is not already one of the [$1 known bugs].',
 'feedback-bugnew'   => 'I checked. Report a new bug',
 
diff --git a/resources/Resources.php b/resources/Resources.php
index 73a8613fb7..33243f2ca6 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -538,8 +538,7 @@ return array(
 			'jquery.ui.dialog',
 		),
 		'messages' => array( 
-			'feedback-note',
-			'feedback-bugnote',
+			'feedback-bugornote',
 			'feedback-subject',
 			'feedback-message',
 			'feedback-cancel',
diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index 258a8917d9..8a9435ec7d 100644
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -77,7 +77,7 @@
 				.attr( { 'href': _this.title.getUrl(), 'target': '_blank' } )
 				.css( { 'white-space': 'nowrap' } );
 
-			var $bugNoteLink = $( '<a></a>' ).attr( { 'href': '#', } ).click( function() { _this.displayBugs(); } );
+			var $bugNoteLink = $( '<a></a>' ).attr( { 'href': '#' } ).click( function() { _this.displayBugs(); } );
 
 			var $bugsListLink = $( '<a></a>' ).attr( { 'href': _this.bugsListLink, 'target': '_blank' } );
 
@@ -86,11 +86,11 @@
 					$( '<div class="feedback-mode feedback-form"></div>' ).append(
 						$( '<small></small>' ).append(  
 							$( '<p></p>' ).msg( 
-								'feedback-note', 
+								'feedback-bugornote', 
+								$bugNoteLink,
 								_this.title.getNameText(), 
 								$feedbackPageLink.clone() 
-							),
-							$( '<p></p>' ).msg( 'feedback-bugnote', $bugNoteLink )
+							)
 						),
 						$( '<div style="margin-top:1em;"></div>' ).append( 
 							mw.msg( 'feedback-subject' ), 
-- 
2.20.1