r108563 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108562‎ | r108563 | r108564 >
Date:23:37, 10 January 2012
Author:rmoen
Status:resolved (Comments)
Tags:
Comment:
make user contrib log reason translatable, add/document reason in language file r108484
Modified paths:
  • /trunk/extensions/MoodBar/ApiMoodBar.php (modified) (history)
  • /trunk/extensions/MoodBar/MoodBar.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/MoodBar/MoodBar.i18n.php
@@ -157,6 +157,7 @@
158158 'moodbar-log-hide' => 'hid [[$1]]',
159159 'moodbar-log-feedback' => 'MoodBar Feedback [[$1]]',
160160 'moodbar-log-restore' => 'restored the visibility for [[$1]]',
 161+ 'moodbar-log-reason' => '$1: $2',
161162 //Feedback Response
162163 'moodbar-response-terms' => 'By submitting, you agree to transparency under these $1.',
163164 'moodbar-response-link' => 'terms',
@@ -329,6 +330,14 @@
330331 'moodbar-response-url' => '{{Optional}}
331332
332333 Terms of use URL. Do not change this URL until a translation of the page itself exists.',
 334+ // Log types
 335+ 'moodbar-log-name' => 'Feedback log name',
 336+ 'moodbar-log-header' => 'Descriptive header text for Feedback log page.',
 337+ 'moodbar-log-hide' => 'Log Action text for hiding feedback [[$1]] is link to feedback item',
 338+ 'moodbar-log-feedback' => 'Log Action text for leaving feedback [[$1]] is link to feedback item',
 339+ 'moodbar-log-restore' => 'Log Action text for restoring feedback [[$1]] is link to feedback item',
 340+ 'moodbar-log-reason' => 'Text for log reason. $1 is moodbar type, $2 is moodbar comment',
 341+ //Feedback Dashboard Response
333342 'response-back-text' => 'Text for response preview back button',
334343 'response-preview-text' => 'Text for preview response preview button',
335344 'response-ajax-action-head' => 'Text for ajax status heading while request is being made',
Index: trunk/extensions/MoodBar/ApiMoodBar.php
@@ -35,11 +35,10 @@
3636 }
3737
3838 public function logFeedback( $params, $itemId ) {
39 - $title = SpecialPage::getTitleFor( 'FeedbackDashboard', $itemId);
40 - $reason = $params['type'] . ': ' . $params['comment'];
 39+ $title = SpecialPage::getTitleFor( 'FeedbackDashboard', $itemId );
 40+ $reason = wfMessage( 'moodbar-log-reason' )->params( $params['type'], $params['comment'] )->escaped();
4141 $log = new LogPage( 'moodbar' );
4242 $log->addEntry( 'feedback', $title, $reason );
43 -
4443 }
4544
4645 public function needsToken() {

Follow-up revisions

RevisionCommit summaryAuthorDate
r108576replaced escape() with text() as LogPage->addEntry handles escape. follow up ...rmoen00:30, 11 January 2012
r108652r108563: Make message optinal for translateraymond19:12, 11 January 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r108484added recent changes log to moodbar feedback, add min height to fbd-list due ...rmoen00:44, 10 January 2012

Comments

#Comment by Catrope (talk | contribs)   00:27, 11 January 2012
+		$reason = wfMessage( 'moodbar-log-reason' )->params( $params['type'], $params['comment'] )->escaped();

This'll lead to double-escaping, LogPage::addEntry() handles escaping itself. Use ->text() rather than ->escaped() .

OK otherwise.

#Comment by Robmoen (talk | contribs)   00:47, 11 January 2012

Follow up is marked ok. Resolved ?

#Comment by Catrope (talk | contribs)   00:52, 11 January 2012

Yeah, sorry, missed this one.

Status & tagging log