summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-11-02 14:21:23 -0700
committerBrion Vibber <brion@pobox.com>2010-11-02 14:21:23 -0700
commit81e06530800bce5eb60eca362d4c21453632183a (patch)
tree10cbcd3d28d3fd1ccc17d4683aeda728b7263274 /actions
parentbc85f6914be97e1b44891153dc96045dfcefcaf6 (diff)
parent6a181bb12837f477dcaa13619024de2f984b7f20 (diff)
Merge branch 'pretty-title2' into 0.9.x
Diffstat (limited to 'actions')
-rw-r--r--actions/showstream.php29
1 files changed, 16 insertions, 13 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index fb5b061fb..dd6c91b00 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);
+ }
}
}