X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fthreadednoticelist.php;h=c3382897c7b368636b8b967b1ec54f9a0d5a4024;hb=9291225a69c586424fb5a40588c115bf1b78bce1;hp=dbf3de642d8021b1c4c5a41adab9fe03239541b4;hpb=12588b1cf73fad7d0a76a29a46ec355150eaa54e;p=quix0rs-gnu-social.git

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index dbf3de642d..c3382897c7 100644
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -80,7 +80,8 @@ class ThreadedNoticeList extends NoticeList
 		$total = count($notices);
 		$notices = array_slice($notices, 0, NOTICES_PER_PAGE);
 		
-    	self::prefill(self::_allNotices($notices));
+        $allnotices = self::_allNotices($notices);
+    	self::prefill($allnotices);
     	
         $conversations = array();
         
@@ -89,7 +90,7 @@ class ThreadedNoticeList extends NoticeList
             // Collapse repeats into their originals...
             
             if ($notice->repeat_of) {
-                $orig = Notice::staticGet('id', $notice->repeat_of);
+                $orig = Notice::getKV('id', $notice->repeat_of);
                 if ($orig) {
                     $notice = $orig;
                 }
@@ -130,7 +131,7 @@ class ThreadedNoticeList extends NoticeList
             $convId[] = $notice->conversation;
         }
         $convId = array_unique($convId);
-        $allMap = Memcached_DataObject::listGet('Notice', 'conversation', $convId);
+        $allMap = Notice::listGet('conversation', $convId);
         $allArray = array();
         foreach ($allMap as $convId => $convNotices) {
             $allArray = array_merge($allArray, $convNotices);
@@ -436,7 +437,7 @@ abstract class NoticeListActorsItem extends NoticeListItem
                 // TRANS: Reference to the logged in user in favourite list.
                 array_unshift($links, _m('FAVELIST', 'You'));
             } else {
-                $profile = Profile::staticGet('id', $id);
+                $profile = Profile::getKV('id', $id);
                 if ($profile) {
                     $links[] = sprintf('<a href="%s">%s</a>',
                                        htmlspecialchars($profile->profileurl),
@@ -569,17 +570,35 @@ class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem
         return $profiles;
     }
 
+    function magicList($items)
+    {
+        if (count($items) > 4) {
+            return parent::magicList(array_slice($items, 0, 3));
+        } else {
+            return parent::magicList($items);
+        }
+    }
+
     function getListMessage($count, $you)
     {
         if ($count == 1 && $you) {
             // darn first person being different from third person!
             // TRANS: List message for notice repeated by logged in user.
-            return _m('REPEATLIST', 'You have repeated this notice.');
+            return _m('REPEATLIST', 'You repeated this.');
+        } else if ($count > 4) {
+            // TRANS: List message for when more than 4 people repeat something.
+            // 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 other repeated this.',
+                              '%%s and %d others repeated this.',
+                              $count - 3),
+                           $count - 3);
         } else {
-            // TRANS: List message for repeated notices.
-            // TRANS: %d is the number of users that have repeated a notice.
-            return sprintf(_m('One person has repeated this notice.',
-                              '%d people have repeated this notice.',
+            // TRANS: List message for favoured notices.
+            // 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 repeated this.',
+                              '%%s repeated this.',
                               $count),
                            $count);
         }