Translation changes, use FancyName in email subject

diff --git a/classes/Profile.php b/classes/Profile.php
index 2bcd1858fec5629959d320226c2f7c3fcc73cc53..0e655faa63ee9c682c25782cca40cbfeec2bd96c 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -238,7 +238,7 @@ class Profile extends Managed_DataObject
         }
 
         if (mb_strlen($this->getFullname()) > 0) {
-            // TRANS: Full name of a profile or group (%1$s) followed by some URI (%2$s) in parentheses.
+            // TRANS: The "fancy name": Full name of a profile or group (%1$s) followed by some URI (%2$s) in parentheses.
             return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->getFullname(), $uri);
         } else {
             return $uri;

diff --git a/lib/mail.php b/lib/mail.php
index 383e2670cf6d857407f84463ba49bfc7193bae1c..42a756ac5dc79b5f11ac0084dee1b05950df0e33 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -712,8 +712,8 @@ function mail_notify_attn(Profile $rcpt, Notice $notice)
     }
 
     // TRANS: E-mail subject for notice notification.
-    // TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-    $subject = sprintf(_('%1$s (@%2$s) sent a notice to your attention'), $sender->getBestName(), $sender->getNickname());
+    // TRANS: %1$s is the "fancy name" for a profile.
+    $subject = sprintf(_('%1$s sent a notice to your attention'), $sender->getFancyName());
 
         // TRANS: Body of @-reply notification e-mail.
         // TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,