https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106302
Revision: 106302
Author: neilk
Date: 2011-12-15 02:06:47 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
put bugzilla link and description into one string (description of form closer
to the form itself). Fix misplaced comma.
Modified Paths:
--------------
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/resources/Resources.php
trunk/phase3/resources/mediawiki/mediawiki.feedback.js
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-12-15 01:55:51 UTC
(rev 106301)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-12-15 02:06:47 UTC
(rev 106302)
@@ -4630,18 +4630,18 @@
'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',
Modified: trunk/phase3/resources/Resources.php
===================================================================
--- trunk/phase3/resources/Resources.php 2011-12-15 01:55:51 UTC (rev
106301)
+++ trunk/phase3/resources/Resources.php 2011-12-15 02:06:47 UTC (rev
106302)
@@ -538,8 +538,7 @@
'jquery.ui.dialog',
),
'messages' => array(
- 'feedback-note',
- 'feedback-bugnote',
+ 'feedback-bugornote',
'feedback-subject',
'feedback-message',
'feedback-cancel',
Modified: trunk/phase3/resources/mediawiki/mediawiki.feedback.js
===================================================================
--- trunk/phase3/resources/mediawiki/mediawiki.feedback.js 2011-12-15
01:55:51 UTC (rev 106301)
+++ trunk/phase3/resources/mediawiki/mediawiki.feedback.js 2011-12-15
02:06:47 UTC (rev 106302)
@@ -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' ),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
