| Index: trunk/extensions/ArticleFeedback/ArticleFeedback.hooks.php |
| — | — | @@ -36,7 +36,8 @@ |
| 37 | 37 | 'articlefeedback-survey-message-success', |
| 38 | 38 | 'articlefeedback-survey-message-error', |
| 39 | 39 | 'articlefeedback-survey-disclaimer', |
| 40 | | - 'articlefeedback-survey-disclaimerlink' |
| | 40 | + 'articlefeedback-survey-disclaimerlink', |
| | 41 | + 'articlefeedback-privacyurl' |
| 41 | 42 | ), |
| 42 | 43 | 'dependencies' => array( |
| 43 | 44 | 'jquery.ui.dialog', |
| — | — | @@ -83,7 +84,7 @@ |
| 84 | 85 | 'articlefeedback-report-panel-description', |
| 85 | 86 | 'articlefeedback-report-empty', |
| 86 | 87 | 'articlefeedback-report-ratings', |
| 87 | | - 'parentheses', |
| | 88 | + 'articlefeedback-privacyurl' |
| 88 | 89 | ), |
| 89 | 90 | 'dependencies' => array( |
| 90 | 91 | 'jquery.appear', |
| — | — | @@ -279,8 +280,7 @@ |
| 280 | 281 | $wgArticleFeedbackTracking, |
| 281 | 282 | $wgArticleFeedbackOptions, |
| 282 | 283 | $wgArticleFeedbackNamespaces, |
| 283 | | - $wgArticleFeedbackRatingTypes, |
| 284 | | - $wgArticleFeedbackPrivacyURL; |
| | 284 | + $wgArticleFeedbackRatingTypes; |
| 285 | 285 | $vars['wgArticleFeedbackSMaxage'] = $wgArticleFeedbackSMaxage; |
| 286 | 286 | $vars['wgArticleFeedbackCategories'] = $wgArticleFeedbackCategories; |
| 287 | 287 | $vars['wgArticleFeedbackBlacklistCategories'] = $wgArticleFeedbackBlacklistCategories; |
| — | — | @@ -290,7 +290,6 @@ |
| 291 | 291 | $vars['wgArticleFeedbackNamespaces'] = $wgArticleFeedbackNamespaces; |
| 292 | 292 | $vars['wgArticleFeedbackWhatsThisPage'] = wfMsgForContent( 'articlefeedback-form-panel-explanation-link' ); |
| 293 | 293 | $vars['wgArticleFeedbackRatingTypesFlipped'] = array_flip( $wgArticleFeedbackRatingTypes ); |
| 294 | | - $vars['wgArticleFeedbackPrivacyURL'] = $wgArticleFeedbackPrivacyURL; |
| 295 | 294 | return true; |
| 296 | 295 | } |
| 297 | 296 | |
| Index: trunk/extensions/ArticleFeedback/modules/jquery.articleFeedback/jquery.articleFeedback.js |
| — | — | @@ -595,7 +595,7 @@ |
| 596 | 596 | .html( function() { |
| 597 | 597 | var link = mw.html.element( |
| 598 | 598 | 'a', { |
| 599 | | - href: context.options.privacyURL |
| | 599 | + href: mw.msg( 'articlefeedback-privacyurl' ) |
| 600 | 600 | }, mw.msg( 'articlefeedback-form-panel-helpimprove-privacy' ) |
| 601 | 601 | ); |
| 602 | 602 | return mw.html.escape( mw.msg( 'articlefeedback-form-panel-helpimprove-note' ) ) |
| Index: trunk/extensions/ArticleFeedback/modules/ext.articleFeedback/ext.articleFeedback.js |
| — | — | @@ -124,7 +124,7 @@ |
| 125 | 125 | .html( function() { |
| 126 | 126 | var link = mw.html.element( |
| 127 | 127 | 'a', { |
| 128 | | - href: mw.config.get( 'wgArticleFeedbackPrivacyURL' ) |
| | 128 | + href: mw.msg( 'articlefeedback-privacyurl' ) |
| 129 | 129 | }, mw.msg( 'articlefeedback-survey-disclaimerlink' ) |
| 130 | 130 | ); |
| 131 | 131 | return mw.html.escape( mw.msg( 'articlefeedback-survey-disclaimer' ) ) |
| — | — | @@ -312,8 +312,7 @@ |
| 313 | 313 | 'accept': 'articlefeedback-pitch-edit-accept', |
| 314 | 314 | 'reject': 'articlefeedback-pitch-reject' |
| 315 | 315 | } |
| 316 | | - }, |
| 317 | | - 'privacyURL': mw.config.get( 'wgArticleFeedbackPrivacyURL' ) |
| | 316 | + } |
| 318 | 317 | }; |
| 319 | 318 | |
| 320 | 319 | /* Load at the bottom of the article */ |
| Index: trunk/extensions/ArticleFeedback/ArticleFeedback.i18n.php |
| — | — | @@ -98,6 +98,7 @@ |
| 99 | 99 | 'articlefeedback-survey-message-success' => 'Thanks for filling out the survey.', |
| 100 | 100 | 'articlefeedback-survey-message-error' => 'An error has occurred. |
| 101 | 101 | Please try again later.', |
| | 102 | + 'articlefeedback-privacyurl' => 'http://wikimediafoundation.org/wiki/Feedback_privacy_statement', |
| 102 | 103 | /* Special:ArticleFeedback */ |
| 103 | 104 | 'articleFeedback-table-caption-dailyhighsandlows' => 'Today\'s highs and lows', |
| 104 | 105 | 'articleFeedback-table-caption-dailyhighs' => 'Pages with highest ratings: $1', |
| — | — | @@ -187,6 +188,7 @@ |
| 188 | 189 | 'articlefeedback-pitch-join-body' => 'Based on {{msg-mw|Articlefeedback-pitch-join-message}}.', |
| 189 | 190 | 'articlefeedback-pitch-join-accept' => '{{Identical|Create an account}}', |
| 190 | 191 | 'articlefeedback-pitch-join-login' => '{{Identical|Log in}}', |
| | 192 | + 'articlefeedback-privacyurl' => 'This URL can be changed to point to a translated version of the page if it exists.', |
| 191 | 193 | 'articleFeedback-table-heading-page' => 'This is used in the [[mw:Extension:ArticleFeedback|Article Feedback extension]]. |
| 192 | 194 | {{Identical|Page}}', |
| 193 | 195 | 'articleFeedback-table-heading-average' => '{{Identical|Average}}', |
| Index: trunk/extensions/ArticleFeedback/ArticleFeedback.php |
| — | — | @@ -88,11 +88,6 @@ |
| 89 | 89 | */ |
| 90 | 90 | $wgArticleFeedbackDashboardTalkPage = "http://www.mediawiki.org/wiki/Talk:Article_feedback"; |
| 91 | 91 | |
| 92 | | -/** |
| 93 | | - * The full URL for the privacy policy links |
| 94 | | - */ |
| 95 | | -$wgArticleFeedbackPrivacyURL = 'http://wikimediafoundation.org/wiki/Feedback_privacy_statement'; |
| 96 | | - |
| 97 | 92 | // Would ordinarily call this articlefeedback but survey names are 16 chars max |
| 98 | 93 | $wgPrefSwitchSurveys['articlerating'] = array( |
| 99 | 94 | 'updatable' => false, |