GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Alternate pretty-title tweaks for #2668

This commit is contained in:
Brion Vibber 2010-11-02 13:42:33 -07:00
parent c6d4612f49
commit 426cda5e1f
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actions/showstream.php
View File

@ -63,18 +63,16 @@ 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);
// TRANS: Page title showing tagged notices in one user's stream. Param 1 is the username, 2 is the hash tag.
$base = sprintf(_('%1$s tagged %2$s'), $base, $this->tag);
}
if ($this->page == 1) {
return $base;
} else {
// TRANS: Extended page title showing tagged notices in one user's stream. Param 1 is the main title clause; 2 is the page number.
return sprintf(_('%1$s, page %2$d'),
$base,
$this->page);

21
classes/Profile.php
View File

@ -141,11 +141,32 @@ class Profile extends Memcached_DataObject
return true;
}
/**
* Gets either the full name (if filled) or the nickname.
*
* @return string
*/
function getBestName()
{
return ($this->fullname) ? $this->fullname : $this->nickname;
}
/**
* Gets the full name (if filled) with nickname as a parenthetical, or the nickname alone
* if no fullname is provided.
*
* @return string
*/
function getFancyName()
{
if ($this->fullname) {
// TRANS: Full name of a profile or group followed by nickname in parens
return sprintf(_('%1$s (%2$s)'), $this->fullname, $this->nickname);
} else {
return $this->nickname;
}
}
/**
* Get the most recent notice posted by this user, if any.
*