diff options
author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /actions/showstream.php | |
parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'actions/showstream.php')
-rw-r--r-- | actions/showstream.php | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 71e10d4d1..dabdcd103 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -63,21 +63,24 @@ class ShowstreamAction extends ProfileAction function title() { - if (!empty($this->profile->fullname)) { - $base = $this->profile->fullname . ' (' . $this->user->nickname . ') '; - } else { - $base = $this->user->nickname; - } + $base = $this->profile->getFancyName(); if (!empty($this->tag)) { - $base .= sprintf(_(' tagged %s'), $this->tag); - } - - if ($this->page == 1) { - return $base; + if ($this->page == 1) { + // TRANS: Page title showing tagged notices in one user's stream. Param 1 is the username, 2 is the hash tag. + return sprintf(_('%1$s tagged %2$s'), $base, $this->tag); + } else { + // TRANS: Page title showing tagged notices in one user's stream. Param 1 is the username, 2 is the hash tag, 3 is the page number. + return sprintf(_('%1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page); + } } else { - return sprintf(_('%1$s, page %2$d'), - $base, - $this->page); + if ($this->page == 1) { + return $base; + } else { + // TRANS: Extended page title showing tagged notices in one user's stream. Param 1 is the username, param 2 is the page number. + return sprintf(_('%1$s, page %2$d'), + $base, + $this->page); + } } } |