fix content check so it shows zeros

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

diff --git a/lib/stream.php b/lib/stream.php
index 65d67d92d4d693e946b006f537d6cb18378f7576..a595958e44e27a8e806a49f205064b8917bdfd8f 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,8 +19,6 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
-
 class StreamAction extends Action {
 
        function handle($args) {
@@ -41,17 +39,17 @@ class StreamAction extends Action {
 
                common_menu_item(common_local_url('all', array('nickname' =>
                                                                                                           $nickname)),
-                                                _t('Personal'),
-                                                (($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
+                                                _('Personal'),
+                                                sprintf(_('%s and friends'), (($user && $user->fullname) ? $user->fullname : $nickname)),
                                                 $action == 'all');
                common_menu_item(common_local_url('replies', array('nickname' =>
                                                                                                                          $nickname)),
-                                                _t('Replies'),  
-                                                _t('Replies to ') . (($user && $user->fullname) ? $user->fullname : $nickname),
+                                                _('Replies'),
+                                                sprintf(_('Replies to %s'), (($user && $user->fullname) ? $user->fullname : $nickname)),
                                                 $action == 'replies');
                common_menu_item(common_local_url('showstream', array('nickname' =>
                                                                                                                          $nickname)),
-                                                _t('Profile'),
+                                                _('Profile'),
                                                 ($user && $user->fullname) ? $user->fullname : $nickname,
                                                 $action == 'showstream');
                common_element_end('ul');
@@ -98,14 +96,14 @@ class StreamAction extends Action {
                        common_text(' (');
                        common_element('a', array('class' => 'inreplyto',
                                                                          'href' => $replyurl),
-                                                  _t('in reply to...'));
+                                                  _('in reply to...'));
                        common_text(')');
                }
-               common_element_start('a', 
+               common_element_start('a',
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),
                                                                   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-                                                                  'title' => _t('reply'),
+                                                                  'title' => _('reply'),
                                                                   'class' => 'replybutton'));
                common_raw('→');
                common_element_end('a');