From 76c591e854a2212adbf158c90eba750440035a78 Mon Sep 17 00:00:00 2001
From: Neil Kandalgaonkar <neilk@users.mediawiki.org>
Date: Tue, 13 Dec 2011 02:44:34 +0000
Subject: [PATCH] add jquery messages to core, config mediawiki.feedback to use
 it correctly

---
 resources/Resources.php                   |  9 ++++++++-
 resources/mediawiki/mediawiki.feedback.js | 14 +++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/resources/Resources.php b/resources/Resources.php
index 970def88a0..197df98d07 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -533,7 +533,9 @@ return array(
 		'scripts' => 'resources/mediawiki/mediawiki.feedback.js',
 		'dependencies' => array( 
 			'mediawiki.api.edit', 
-			'mediawiki.Title' 
+			'mediawiki.Title',
+			'mediawiki.jqueryMsg',
+			'jquery.ui.dialog',
 		),
 		'messages' => array( 
 			'feedback-note',
@@ -673,6 +675,11 @@ return array(
 		),
 	),
 
+	'mediawiki.jqueryMsg' => array(
+		'dependencies' => array( 'mediawiki.language', 'mediawiki.util' ),
+		'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js'
+	),
+
 	/* MediaWiki Libs */
 
 	'mediawiki.libs.jpegmeta' => array(
diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index 3e84e081d6..975d19f0b3 100644
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -52,8 +52,8 @@
 
 			// Set up buttons for dialog box. We have to do it the hard way since the json keys are localized
 			_this.buttons = {};
-			_this.buttons[ mw.msg( 'mwe-upwiz-feedback-cancel' ) ] = function() { _this.cancel(); };
-			_this.buttons[ mw.msg( 'mwe-upwiz-feedback-submit' ) ] = function() { _this.submit(); };
+			_this.buttons[ mw.msg( 'feedback-cancel' ) ] = function() { _this.cancel(); };
+			_this.buttons[ mw.msg( 'feedback-submit' ) ] = function() { _this.submit(); };
 				
 			var $feedbackPageLink = $j( '<a></a>' ).attr( { 'href': _this.feedbackTitle.getUrl(), 'target': '_blank' } );
 			this.$dialog = 
@@ -65,18 +65,18 @@
 										    $feedbackPageLink ) 
 						),
 						$( '<div style="margin-top:1em;"></div>' ).append( 
-							mw.msg( 'mwe-upwiz-feedback-subject' ), 
+							mw.msg( 'feedback-subject' ), 
 							$( '<br/>' ), 
 							$( '<input type="text" class="feedback-subject" name="subject" maxlength="60" style="width:99%;"/>' ) 
 						),
 						$( '<div style="margin-top:0.4em;"></div>' ).append( 
-							mw.msg( 'mwe-upwiz-feedback-message' ), 
+							mw.msg( 'feedback-message' ), 
 							$( '<br/>' ), 
 							$( '<textarea name="message" class="feedback-message" style="width:99%;" rows="5" cols="60"></textarea>' ) 
 						)
 					),
-					$( '<div class="mwe-upwiz-feedback-mode mwe-upwiz-feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append( 
-						mw.msg( 'mwe-upwiz-feedback-adding' ), 
+					$( '<div class="feedback-mode feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append( 
+						mw.msg( 'feedback-adding' ), 
 						$( '<br/>' ), 
 						$( '<img src="http://upload.wikimedia.org/wikipedia/commons/4/42/Loading.gif" />' ) 
 					),
@@ -87,7 +87,7 @@
 				).dialog({
 					width: 500,
 					autoOpen: false,
-					title: mw.msg( 'mwe-upwiz-feedback-title' ),
+					title: mw.msg( this.dialogTitleMessageKey ),
 					modal: true,
 					buttons: _this.buttons
 				}); 
-- 
2.20.1