lost the site name, and moved everything into sprintf of gettext

darcs-hash:20080712202903-84dde-e210b42815db5601579a0a890385762c3a54fe5e.gz

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 4de831990c5807762ab747235921b6f54aaa1dcf..4a17e302f431300005a39066ebc8d621a191cf5b 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -83,14 +83,9 @@ class SubscribeAction extends Action {
                        $headers['To'] = $name . ' <' . $listenee->email . '>';
                        $headers['Subject'] = sprintf(_('%1$s is now listening to your notices on %2$s.'), $other->getBestName(),
                                                                                  common_config('site', 'name'));
-                       $body  = sprintf(_('%1$s is now listening to your notices on %2$s.'), $long_name, common_config('site', 'name'));
-                       $body .= "\n\n";
-                       $body .= "\t".$other->profileurl;
-                       $body .= "\n\n";
-                       $body .= _('Faithfully yours, ');
-                       $body .= "\n";
-                       $body .= $config['site']['name'];
-                       $body .= "\n";
+                       $body  = sprintf(_("%1$s is now listening to your notices on %2$s.\n\n".
+                                                          "\t3$s\n\n".
+                                                          "Faithfully yours,\n%2$s\n"), $long_name, common_config('site', 'name'), $other->profileurl);
 
                        mail_send($recipients, $headers, $body);
                }