| Index: trunk/phase3/resources/Resources.php |
| — | — | @@ -533,7 +533,9 @@ |
| 534 | 534 | 'scripts' => 'resources/mediawiki/mediawiki.feedback.js', |
| 535 | 535 | 'dependencies' => array( |
| 536 | 536 | 'mediawiki.api.edit', |
| 537 | | - 'mediawiki.Title' |
| | 537 | + 'mediawiki.Title', |
| | 538 | + 'mediawiki.jqueryMsg', |
| | 539 | + 'jquery.ui.dialog', |
| 538 | 540 | ), |
| 539 | 541 | 'messages' => array( |
| 540 | 542 | 'feedback-note', |
| — | — | @@ -673,6 +675,11 @@ |
| 674 | 676 | ), |
| 675 | 677 | ), |
| 676 | 678 | |
| | 679 | + 'mediawiki.jqueryMsg' => array( |
| | 680 | + 'dependencies' => array( 'mediawiki.language', 'mediawiki.util' ), |
| | 681 | + 'scripts' => 'resources/mediawiki/mediawiki.jqueryMsg.js' |
| | 682 | + ), |
| | 683 | + |
| 677 | 684 | /* MediaWiki Libs */ |
| 678 | 685 | |
| 679 | 686 | 'mediawiki.libs.jpegmeta' => array( |
| Index: trunk/phase3/resources/mediawiki/mediawiki.feedback.js |
| — | — | @@ -52,8 +52,8 @@ |
| 53 | 53 | |
| 54 | 54 | // Set up buttons for dialog box. We have to do it the hard way since the json keys are localized |
| 55 | 55 | _this.buttons = {}; |
| 56 | | - _this.buttons[ mw.msg( 'mwe-upwiz-feedback-cancel' ) ] = function() { _this.cancel(); }; |
| 57 | | - _this.buttons[ mw.msg( 'mwe-upwiz-feedback-submit' ) ] = function() { _this.submit(); }; |
| | 56 | + _this.buttons[ mw.msg( 'feedback-cancel' ) ] = function() { _this.cancel(); }; |
| | 57 | + _this.buttons[ mw.msg( 'feedback-submit' ) ] = function() { _this.submit(); }; |
| 58 | 58 | |
| 59 | 59 | var $feedbackPageLink = $j( '<a></a>' ).attr( { 'href': _this.feedbackTitle.getUrl(), 'target': '_blank' } ); |
| 60 | 60 | this.$dialog = |
| — | — | @@ -65,18 +65,18 @@ |
| 66 | 66 | $feedbackPageLink ) |
| 67 | 67 | ), |
| 68 | 68 | $( '<div style="margin-top:1em;"></div>' ).append( |
| 69 | | - mw.msg( 'mwe-upwiz-feedback-subject' ), |
| | 69 | + mw.msg( 'feedback-subject' ), |
| 70 | 70 | $( '<br/>' ), |
| 71 | 71 | $( '<input type="text" class="feedback-subject" name="subject" maxlength="60" style="width:99%;"/>' ) |
| 72 | 72 | ), |
| 73 | 73 | $( '<div style="margin-top:0.4em;"></div>' ).append( |
| 74 | | - mw.msg( 'mwe-upwiz-feedback-message' ), |
| | 74 | + mw.msg( 'feedback-message' ), |
| 75 | 75 | $( '<br/>' ), |
| 76 | 76 | $( '<textarea name="message" class="feedback-message" style="width:99%;" rows="5" cols="60"></textarea>' ) |
| 77 | 77 | ) |
| 78 | 78 | ), |
| 79 | | - $( '<div class="mwe-upwiz-feedback-mode mwe-upwiz-feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append( |
| 80 | | - mw.msg( 'mwe-upwiz-feedback-adding' ), |
| | 79 | + $( '<div class="feedback-mode feedback-submitting" style="text-align:center;margin:3em 0;"></div>' ).append( |
| | 80 | + mw.msg( 'feedback-adding' ), |
| 81 | 81 | $( '<br/>' ), |
| 82 | 82 | $( '<img src="http://upload.wikimedia.org/wikipedia/commons/4/42/Loading.gif" />' ) |
| 83 | 83 | ), |
| — | — | @@ -87,7 +87,7 @@ |
| 88 | 88 | ).dialog({ |
| 89 | 89 | width: 500, |
| 90 | 90 | autoOpen: false, |
| 91 | | - title: mw.msg( 'mwe-upwiz-feedback-title' ), |
| | 91 | + title: mw.msg( this.dialogTitleMessageKey ), |
| 92 | 92 | modal: true, |
| 93 | 93 | buttons: _this.buttons |
| 94 | 94 | }); |