summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Lang <mail@adrianlang.de>2009-02-02 01:43:41 +0100
committerEvan Prodromou <evan@controlyourself.ca>2009-02-05 11:53:32 -0500
commit68a3139d0b86a2a716b24a481e677aa5d4699396 (patch)
treeb655b05413f1b3652f474b65989878bf816f6052
parent43feee783b253f716a46ebfce5fc4861fa66ea66 (diff)
Fix #81: Profile and personal shows „you“ instead of username when looking at own profile / personal. While doing so I fixed a wrong gettext usage were the result was not sprintf'd, but concat'd.
-rw-r--r--actions/all.php11
-rw-r--r--actions/showstream.php7
2 files changed, 17 insertions, 1 deletions
diff --git a/actions/all.php b/actions/all.php
index 428466f24..b03ad7ec3 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -101,4 +101,15 @@ class AllAction extends Action
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'all', array('nickname' => $this->user->nickname));
}
+
+ function showPageTitle()
+ {
+ $user =& common_current_user();
+ if ($user && ($user->id == $this->user->id)) {
+ $this->element('h1', NULL, _("You and friends"));
+ } else {
+ $this->element('h1', NULL, sprintf(_('%s and friends'), $this->user->nickname));
+ }
+ }
+
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 90ffcacf9..4b1679969 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -140,7 +140,12 @@ class ShowstreamAction extends Action
function showPageTitle()
{
- $this->element('h1', NULL, $this->profile->nickname._("'s profile"));
+ $user =& common_current_user();
+ if ($user && ($user->id == $this->profile->id)) {
+ $this->element('h1', NULL, _("Your profile"));
+ } else {
+ $this->element('h1', NULL, sprintf(_('%s\'s profile'), $this->profile->nickname));
+ }
}
function showPageNoticeBlock()