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

Update translator documentation.

diff --git a/plugins/EmailSummary/siteemailsummaryhandler.php b/plugins/EmailSummary/siteemailsummaryhandler.php
index 3369a5a70321bd266613f5e59df04c1748cdb2b2..37e1a227f39f8bff623626bcd866a7dd8ddb1767 100644 (file)
--- a/plugins/EmailSummary/siteemailsummaryhandler.php
+++ b/plugins/EmailSummary/siteemailsummaryhandler.php
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  */
 class SiteEmailSummaryHandler extends QueueHandler
 {
-
     /**
      * Return transport keyword which identifies items this queue handler
      * services; must be defined for all subclasses.

diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php
index 316e09d5b78dcd67e582c1e775024333a8770f34..dca1be24bc6d5a60ef8ae7b3cb320575f538f824 100644 (file)
--- a/plugins/EmailSummary/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/useremailsummaryhandler.php
@@ -181,6 +181,7 @@ class UserEmailSummaryHandler extends QueueHandler
                     $out->text(' ');
                     $out->element('a',
                                   array('href' => $convurl.'#notice-'.$notice->id),
+                                  // TRANS: Link text for link to conversation view.
                                   _m('in context'));
                 }
             }
@@ -191,9 +192,11 @@ class UserEmailSummaryHandler extends QueueHandler
 
         $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_config('site', 'name')));
+                          common_config('site', 'name'))."</p>");
 
         $out->elementEnd('div');
 
@@ -201,6 +204,7 @@ class UserEmailSummaryHandler extends QueueHandler
 
         // 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,
                      array('Content-Type' => 'text/html; charset=UTF-8'));