summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-10 00:51:26 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-10 00:51:26 -0400
commit7e38142d4aa080767617724a98c0cf60c70961d0 (patch)
treed4befe70bb5f82fa78b82465ddec597e1d67f72e /actions
parent4b656f47dff2bd6eed4dcfad060b8434d052d883 (diff)
Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/login.php2
-rw-r--r--actions/register.php2
-rw-r--r--actions/showstream.php14
3 files changed, 13 insertions, 5 deletions
diff --git a/actions/login.php b/actions/login.php
index 649f7ec9a..d84a0b8cb 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -66,7 +66,7 @@ class LoginAction extends Action {
# success!
if (!common_set_user($user)) {
- common_server_error(_t('Error setting user.'));
+ common_server_error(_('Error setting user.'));
return;
}
diff --git a/actions/register.php b/actions/register.php
index 45446dce6..37e787c9d 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -66,7 +66,7 @@ class RegisterAction extends Action {
} else {
$user = $this->register_user($nickname, $password, $email);
if (!$user) {
- $this->show_form(_t('Invalid username or password.'));
+ $this->show_form(_('Invalid username or password.'));
return;
}
# success!
diff --git a/actions/showstream.php b/actions/showstream.php
index 2a2d9d3b4..b70c0b994 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -337,7 +337,7 @@ class ShowstreamAction extends StreamAction {
common_element('h2', NULL, _('Currently'));
$notice = $profile->getCurrentNotice();
-
+
if ($notice) {
# FIXME: URL, image, video, audio
common_element_start('p', array('class' => 'notice_current'));
@@ -375,11 +375,19 @@ class ShowstreamAction extends StreamAction {
'href' => $noticeurl,
'title' => common_exact_date($notice->created)),
common_date_string($notice->created));
- common_element_start('a',
+ if ($notice->reply_to) {
+ $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+ common_text(' (');
+ common_element('a', array('class' => 'inreplyto',
+ 'href' => $replyurl),
+ _('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('&rarr;');
common_element_end('a');