diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/apifriendshipsexists.php | 2 | ||||
| -rw-r--r-- | actions/apioauthauthorize.php | 2 | ||||
| -rw-r--r-- | actions/shownotice.php | 26 |
3 files changed, 28 insertions, 2 deletions
diff --git a/actions/apifriendshipsexists.php b/actions/apifriendshipsexists.php index c8766633b..43b1daf4f 100644 --- a/actions/apifriendshipsexists.php +++ b/actions/apifriendshipsexists.php @@ -85,7 +85,7 @@ class ApiFriendshipsExistsAction extends ApiPrivateAuthAction if (empty($this->profile_a) || empty($this->profile_b)) { $this->clientError( // TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists. - _('Two valid IDs or screen_names must be supplied.'), + _('Two valid IDs or nick names must be supplied.'), 400, $this->format ); diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index b2c0de719..d76ae060f 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -421,7 +421,7 @@ class ApiOauthAuthorizeAction extends Action if ($this->app->name == 'anonymous') { // Special message for the anonymous app and consumer. // TRANS: User notification of external application requesting account access. - // TRANS: %3$s is the access type requested, %4$s is the StatusNet sitename. + // TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename. $msg = _('An application would like the ability ' . 'to <strong>%3$s</strong> your %4$s account data. ' . 'You should only give access to your %4$s account ' . diff --git a/actions/shownotice.php b/actions/shownotice.php index 7cc6c5424..b7e61a137 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -331,6 +331,32 @@ class SingleNoticeItem extends DoFollowListItem $this->showEnd(); } + /** + * show the avatar of the notice's author + * + * We use the larger size for single notice page. + * + * @return void + */ + + function showAvatar() + { + $avatar_size = AVATAR_PROFILE_SIZE; + + $avatar = $this->profile->getAvatar($avatar_size); + + $this->out->element('img', array('src' => ($avatar) ? + $avatar->displayUrl() : + Avatar::defaultImage($avatar_size), + 'class' => 'avatar photo', + 'width' => $avatar_size, + 'height' => $avatar_size, + 'alt' => + ($this->profile->fullname) ? + $this->profile->fullname : + $this->profile->nickname)); + } + function showNoticeAttachments() { $al = new AttachmentList($this->notice, $this->out); $al->show(); |