Merge branch 'master' of gitorious.org:statusnet/mainline into testing

diff --cc classes/Notice.php
Simple merge

diff --cc lib/mail.php
index c38d9f2f504b3b79e923a2c2100a74a2083feff3,d73603694dec116010c61daa3d1f79daeb131dc2..5fc584e28aa8636d99b099fa3c7949f5c9c5ef30
--- 1/lib/mail.php
--- 2/lib/mail.php
+++ b/lib/mail.php
@@@ -636,17 -620,17 +636,17 @@@ function mail_notify_attn($user, $notic
  
      $bestname = $sender->getBestName();
  
-     common_init_locale($user->language);
+     common_switch_locale($user->language);
  
 -        if ($notice->conversation != $notice->id) {
 -                $conversationEmailText = "The full conversation can be read here:\n\n".
 -                                                                 "\t%5\$s\n\n ";
 -                $conversationUrl            = common_local_url('conversation',
 -                                 array('id' => $notice->conversation)).'#notice-'.$notice->id;
 -        } else {
 -                $conversationEmailText = "%5\$s";
 -                $conversationUrl = null;
 -        }
 +    if ($notice->hasConversation()) {
 +        $conversationUrl = common_local_url('conversation',
 +                         array('id' => $notice->conversation)).'#notice-'.$notice->id;
 +        // TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 +        $conversationEmailText = sprintf(_("The full conversation can be read here:\n\n".
 +                                           "\t%s"), $conversationUrl) . "\n\n";
 +    } else {
 +        $conversationEmailText = '';
 +    }
  
      $subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname);
  

diff --cc lib/util.php
Simple merge