GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix incorrect parameter in sprintf(). Spotted by Giftpflanze.

Browse Source 
Update translator documentation.
This commit is contained in:
Siebrand Mazeland 2011-04-24 19:53:28 +02:00
parent e6d053ac41
commit f70569ddb5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/EmailSummary/siteemailsummaryhandler.php
View File

@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
*/ */
class SiteEmailSummaryHandler extends QueueHandler class SiteEmailSummaryHandler extends QueueHandler
{ {
/** /**
* Return transport keyword which identifies items this queue handler * Return transport keyword which identifies items this queue handler
* services; must be defined for all subclasses. * services; must be defined for all subclasses.

8
plugins/EmailSummary/useremailsummaryhandler.php
View File

@ -181,6 +181,7 @@ class UserEmailSummaryHandler extends QueueHandler
$out->text(' '); $out->text(' ');
$out->element('a', $out->element('a',
array('href' => $convurl.'#notice-'.$notice->id), array('href' => $convurl.'#notice-'.$notice->id),
// TRANS: Link text for link to conversation view.
_m('in context')); _m('in context'));
} }
} }
@ -191,9 +192,11 @@ class UserEmailSummaryHandler extends QueueHandler
$out->elementEnd('table'); $out->elementEnd('table');
$out->raw(sprintf(_m('<p><a href="%1s">change your email settings for %2s</a></p>'), // TRANS: Link text for link to e-mail settings.
// TRANS: %1$s is a link to the e-mail settings, %2$s is the StatusNet sitename.
$out->raw("<p>" . sprintf(_m('<a href="%1s">change your email settings for %2$s</a>'),
common_local_url('emailsettings'), common_local_url('emailsettings'),
common_config('site', 'name'))); common_config('site', 'name'))."</p>");
$out->elementEnd('div'); $out->elementEnd('div');
@ -201,6 +204,7 @@ class UserEmailSummaryHandler extends QueueHandler
// FIXME: do something for people who don't like HTML email // FIXME: do something for people who don't like HTML email
// TRANS: Subject for e-mail.
mail_to_user($user, _m('Updates from your network'), $body, mail_to_user($user, _m('Updates from your network'), $body,
array('Content-Type' => 'text/html; charset=UTF-8')); array('Content-Type' => 'text/html; charset=UTF-8'));