twiddle some parens in imsettings for gettext

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

diff --git a/lib/stream.php b/lib/stream.php
index 3222a8ab0326c50680f33fc55ab9159ad813089a..ad65e2d2a293702231a513b0959225d68f1dd4da 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -41,23 +41,23 @@ 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');
        }
 
-       function show_notice($notice, $replied_id=NULL) {
+       function show_notice($notice) {
                global $config;
                $profile = $notice->getProfile();
                # XXX: RDFa
@@ -78,22 +78,37 @@ class StreamAction extends Action {
                                           $profile->nickname);
                # FIXME: URL, image, video, audio
                common_element_start('p', array('class' => 'content'));
-               common_raw(common_render_content($notice->content, $notice));
+               if ($notice->rendered) {
+                       common_raw($notice->rendered);
+               } else {
+                       # XXX: may be some uncooked notices in the DB,
+                       # we cook them right now. This should probably disappear in future
+                       # versions (>> 0.4.x)
+                       common_raw(common_render_content($notice->content, $notice));
+               }
                common_element_end('p');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element_start('p', 'time');
-               common_element('a', array('class' => 'notice',
+               common_element('a', array('class' => 'permalink',
                                                                  'href' => $noticeurl,
                                                                  'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
-               if ($replied_id) {
-                       $replyurl = common_local_url('shownotice', array('notice' => $replied_id));
-                       common_text('(');
+               if ($notice->reply_to) {
+                       $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+                       common_text(' (');
                        common_element('a', array('class' => 'inreplyto',
                                                                          'href' => $replyurl),
-                                                  _t(' in reply to...'));
+                                                  _('in reply to...'));
                        common_text(')');
                }
+               common_element_start('a',
+                                                        array('href' => common_local_url('newnotice',
+                                                                                                                         array('replyto' => $profile->nickname)),
+                                                                  'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+                                                                  'title' => _('reply'),
+                                                                  'class' => 'replybutton'));
+               common_raw('→');
+               common_element_end('a');
                common_element_end('p');
                common_element_end('li');
        }