Merge branch 'limitdist2' into 1.0.x

[quix0rs-gnu-social.git] / classes / Profile.php

diff --git a/classes/Profile.php b/classes/Profile.php
index d86bf98e8315b5d0dd6b1251477cf2916f40f9c3..73a98d4ff51541e1b4b4e05c9d99e3c37af97098 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -168,7 +168,7 @@ class Profile extends Memcached_DataObject
     function getFancyName()
     {
         if ($this->fullname) {
-            // TRANS: Full name of a profile or group followed by nickname in parens
+            // TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
             return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->fullname, $this->nickname);
         } else {
             return $this->nickname;
@@ -180,7 +180,6 @@ class Profile extends Memcached_DataObject
      *
      * @return mixed Notice or null
      */
-
     function getCurrentNotice()
     {
         $notice = $this->getNotices(0, 1);
@@ -443,7 +442,7 @@ class Profile extends Memcached_DataObject
     {
         return Subscription::exists($this, $other);
     }
-    
+
     /**
      * Check if a pending subscription request is outstanding for this...
      *