r106663 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r106662‎ | r106663 | r106664 >
Date:16:17, 19 December 2011
Author:catrope
Status:ok (Comments)
Tags:aft 
Comment:
Fix r106636, r106653: revert {{SITENAME}} changes, can't use {{SITENAME}} in JS messages
Modified paths:
  • /trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php
@@ -20,11 +20,11 @@
2121 'articlefeedbackv5-cta-thanks' => 'Thanks!',
2222 'articlefeedbackv5-cta-confirmation-followup' => 'Your feedback has been saved.',
2323 'articlefeedbackv5-cta1-confirmation-title' => 'Did you know that you can edit this page?',
24 - 'articlefeedbackv5-cta1-confirmation-call' => '{{SITENAME}} works because anyone can edit its pages. Go ahead, give it a try. Be bold!',
 24+ 'articlefeedbackv5-cta1-confirmation-call' => 'Wikipedia works because anyone can edit its pages. Go ahead, give it a try. Be bold!',
2525 'articlefeedbackv5-cta1-learn-how' => 'Learn how to edit',
2626 'articlefeedbackv5-cta1-learn-how-url' => 'http://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Tutorial',
2727 'articlefeedbackv5-cta1-edit-linktext' => 'Edit this page',
28 - 'articlefeedbackv5-cta2-confirmation-title' => 'Help improve {{SITENAME}}',
 28+ 'articlefeedbackv5-cta2-confirmation-title' => 'Help improve Wikipedia',
2929 'articlefeedbackv5-cta2-confirmation-call' => 'This website is created by people like you. Can you give us a hand?',
3030 'articlefeedbackv5-cta2-button-text' => 'Learn more',
3131
@@ -112,11 +112,11 @@
113113 /* Option 4 (just a big glossy edit button and some teaser text) */
114114 'articlefeedbackv5-bucket4-title' => 'Help improve this page',
115115 'articlefeedbackv5-bucket4-subhead' => 'Did you know that you can edit this page?',
116 - 'articlefeedbackv5-bucket4-teaser-line1' => '{{SITENAME}} works because anyone can edit its pages.',
 116+ 'articlefeedbackv5-bucket4-teaser-line1' => 'Wikipedia works because anyone can edit its pages.',
117117 'articlefeedbackv5-bucket4-teaser-line2' => 'Go ahead, give it a try. Be bold!',
118118 'articlefeedbackv5-bucket4-learn-to-edit' => 'Learn how to edit',
119119 'articlefeedbackv5-bucket4-form-submit' => 'Edit this page',
120 - 'articlefeedbackv5-bucket4-help-tooltip-info' => '{{SITENAME}} wants to know what you think. Help improve this page by becoming an editor.',
 120+ 'articlefeedbackv5-bucket4-help-tooltip-info' => 'Wikipedia wants to know what you think. Help improve this page by becoming an editor.',
121121 /* Option 5 (just like AFTv4, but ported to work with v5) */
122122 'articlefeedbackv5-bucket5-form-switch-label' => 'Rate this page',
123123 'articlefeedbackv5-bucket5-form-panel-title' => 'Rate this page',
@@ -128,7 +128,7 @@
129129 'articlefeedbackv5-bucket5-form-panel-expertise-profession' => 'It is part of my profession',
130130 'articlefeedbackv5-bucket5-form-panel-expertise-hobby' => 'It is a deep personal passion',
131131 'articlefeedbackv5-bucket5-form-panel-expertise-other' => 'The source of my knowledge is not listed here',
132 - 'articlefeedbackv5-bucket5-form-panel-helpimprove' => 'I would like to help improve {{SITENAME}}, send me an e-mail (optional)',
 132+ 'articlefeedbackv5-bucket5-form-panel-helpimprove' => 'I would like to help improve Wikipedia, send me an e-mail (optional)',
133133 'articlefeedbackv5-bucket5-form-panel-helpimprove-note' => 'We will send you a confirmation e-mail. We will not share your e-mail address with outside parties as per our $1.',
134134 'articlefeedbackv5-bucket5-form-panel-helpimprove-email-placeholder' => 'email@example.org', // Optional
135135 'articlefeedbackv5-bucket5-form-panel-helpimprove-privacy' => 'feedback privacy statement',
@@ -175,7 +175,7 @@
176176 'articlefeedbackv5-shared-on-feedback' => 'Your comment will be shared on this $1.',
177177 'articlefeedbackv5-shared-on-feedback-linktext' => 'feedback page',
178178 'articlefeedbackv5-help-tooltip-title' => 'What\'s this?',
179 - 'articlefeedbackv5-help-tooltip-info' => '{{SITENAME}} would like to hear what you think of this page. Share your feedback with the editors -- and help improve this page.',
 179+ 'articlefeedbackv5-help-tooltip-info' => 'Wikipedia would like to hear what you think of this page. Share your feedback with the editors -- and help improve this page.',
180180 'articlefeedbackv5-help-tooltip-linktext' => 'Learn more',
181181 'articlefeedbackv5-help-tooltip-linkurl' => 'http://en.wikipedia.org/wiki/Wikipedia:Article_Feedback_Tool/Version_5/Help',
182182 'articlefeedbackv5-transparency-terms' => 'By posting, you agree to transparency under these $1.',

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r106636* article -> page and other messages tweaks...siebrand10:32, 19 December 2011
r106653Add header and Wikipedia -> SITENAMEsiebrand14:36, 19 December 2011

Comments

#Comment by Siebrand (talk | contribs)   19:32, 19 December 2011

With the JS libraries that NielK added last week this should be possible. Same should be true for plural in JS.

#Comment by Catrope (talk | contribs)   19:33, 19 December 2011

Yeah, it needs to be properly integrated though. I should talk to Neil.

#Comment by NeilK (talk | contribs)   19:37, 19 December 2011

Catrope: Yeah, to keep the library 100% testable, I made it so you have to pass in a hash of magic keywords as a constructor argument. See r106228 where I just copy over the existing objects with more 'magical' versions

But this is at odds with the library just being there and ready for people to use, which is what I think people expect. Maybe in initialization we need to add common magic from wg constants.

#Comment by Catrope (talk | contribs)   19:39, 19 December 2011

I would really love for this to just be there and ready. If you can make that happen in trunk, that would be awesome.

Status & tagging log