Move prefill call to noticelist class

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

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 32a417d7fab84038f04a40a903178da9c6d14393..45c11453a7a63699f9cfb866c39939375d08f9c2 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -76,17 +76,18 @@ class ThreadedNoticeList extends NoticeList
         $this->out->element('h2', null, _m('HEADER','Notices'));
         $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
 
+               $notices = $this->notice->fetchAll();
+               $notices = array_slice($notices, 0, NOTICES_PER_PAGE);
+               
+       $this->prefill($notices);
+       
         $cnt = 0;
         $conversations = array();
-        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
+        
+        foreach ($notices as $notice) {
 
             // Collapse repeats into their originals...
-            $notice = $this->notice;
+            
             if ($notice->repeat_of) {
                 $orig = Notice::staticGet('id', $notice->repeat_of);
                 if ($orig) {
@@ -223,6 +224,8 @@ class ThreadedNoticeListItem extends NoticeListItem
                         $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out, count($notices));
                         $item->show();
                     }
+                    // XXX: replicating NoticeList::prefill(), annoyingly
+                    $this->prefill($notices);
                     foreach (array_reverse($notices) as $notice) {
                         if (Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice))) {
                             $item = new ThreadedNoticeListSubItem($notice, $this->notice, $this->out);
@@ -247,6 +250,12 @@ class ThreadedNoticeListItem extends NoticeListItem
 
         parent::showEnd();
     }
+    
+    function prefill(&$notices)
+    {       
+       // Prefill the profiles
+       Notice::fillProfiles($notices);
+    }
 }
 
 // @todo FIXME: needs documentation.
@@ -452,9 +461,9 @@ abstract class NoticeListActorsItem extends NoticeListItem
         } else {
             $first = array_slice($items, 0, -1);
             $last = array_slice($items, -1, 1);
-            // TRANS: Separator in list of user names like "You, Bob, Mary".
+            // TRANS: Separator in list of user names like "Jim, Bob, Mary".
             $separator = _(', ');
-            // TRANS: For building a list such as "You, bob, mary and 5 others have favored this notice".
+            // TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this".
             // TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list.
             return sprintf(_m('FAVELIST', '%1$s and %2$s'), implode($separator, $first), implode($separator, $last));
         }
@@ -493,11 +502,16 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem
             return _m('FAVELIST', 'You like this.');
         } else if ($count > 4) {
             // TRANS: List message for when more than 4 people like something.
-            return sprintf(_m('FAVELIST', '%%s and %d others like this.'),
+            // TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+            // TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+            return sprintf(_m('%%s and %d others like this.',
+                              '%%s and %d others like this.',
+                              $count),
                            $count - 3);
         } else {
             // TRANS: List message for favoured notices.
-            // TRANS: %d is the number of users that have favoured a notice.
+            // TRANS: %%s is a list of users liking a notice.
+            // TRANS: Plural is based on the number of of users that have favoured a notice.
             return sprintf(_m('%%s likes this.',
                               '%%s like this.',
                               $count),
@@ -505,7 +519,6 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem
         }
     }
 
-    
     function showStart()
     {
         $this->out->elementStart('li', array('class' => 'notice-data notice-faves'));
@@ -515,7 +528,6 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem
     {
         $this->out->elementEnd('li');
     }
-
 }
 
 // @todo FIXME: needs documentation.