From 7e38142d4aa080767617724a98c0cf60c70961d0 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Thu, 10 Jul 2008 00:51:26 -0400 Subject: Resolve conflicts and convert _t( to _( where it was introduced again. darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz --- lib/stream.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stream.php') diff --git a/lib/stream.php b/lib/stream.php index d6180f4ed..ad65e2d2a 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -98,14 +98,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', 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'); -- cgit v1.2.3-54-g00ecf