Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / togglepeopletag.php

diff --git a/lib/togglepeopletag.php b/lib/togglepeopletag.php
index bc9d136fe5c2ce4585754336812b19fd3309f5d0..fdbf2b7cdb959f4c769b8e78c2480372ff44f214 100644 (file)
--- a/lib/togglepeopletag.php
+++ b/lib/togglepeopletag.php
@@ -186,8 +186,8 @@ class UntagButton extends Form
     function formLegend()
     {
         // TRANS: Form legend.
-        // TRANS: %1$s is a nickname, $2$s is a people tag.
-        $this->out->element('legend', null, sprintf(_('Untag %1$s as %2$s'),
+        // TRANS: %1$s is a nickname, $2$s is a list.
+        $this->out->element('legend', null, sprintf(_('Remove %1$s from list %2$s'),
             $this->profile->nickname, $this->peopletag->tag));
     }
 
@@ -263,9 +263,9 @@ class TagButton extends Form
      */
     function formLegend()
     {
-        // TRANS: Legend on form to add a tag to a profile.
-        // TRANS: %1$s is a nickname, %2$s ia a people tag.
-        $this->out->element('legend', null, sprintf(_('Tag %1$s as %2$s'),
+        // TRANS: Legend on form to add a profile to a list.
+        // TRANS: %1$s is a nickname, %2$s is a list.
+        $this->out->element('legend', null, sprintf(_('Add %1$s to list %2$s'),
             $this->profile->nickname, $this->peopletag->tag));
     }
 
@@ -306,9 +306,8 @@ class TaggedProfileItem extends Widget
         $this->out->elementStart('a', array('class' => 'url',
                                             'href' => $this->profile->profileurl,
                                             'title' => $this->profile->getBestName()));
-        $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :
-                                         Avatar::defaultImage(AVATAR_MINI_SIZE)),
+        $avatarUrl = $this->profile->avatarUrl(AVATAR_MINI_SIZE);
+        $this->out->element('img', array('src' => $avatarUrl,
                                          'width' => AVATAR_MINI_SIZE,
                                          'height' => AVATAR_MINI_SIZE,
                                          'class' => 'avatar photo',