diff options
author | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
commit | ecb3abf84c8b6e868a523b8e721484cb7a4e0f63 (patch) | |
tree | c27d9b8c427e0e64b0cabe9419c640ac8b382c3b /actions/all.php | |
parent | a180658a3bfcf2b7b312058e3aa76e0e2467c2f8 (diff) | |
parent | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (diff) |
Merge branch '0.9.x' into inblob
Diffstat (limited to 'actions/all.php')
-rw-r--r-- | actions/all.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/all.php b/actions/all.php index 452803d8a..efa4521e2 100644 --- a/actions/all.php +++ b/actions/all.php @@ -81,7 +81,7 @@ class AllAction extends ProfileAction function title() { if ($this->page > 1) { - return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page); + return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page); } else { return sprintf(_("%s and friends"), $this->user->nickname); } @@ -131,7 +131,7 @@ class AllAction extends ProfileAction if ($this->user->id === $current_user->id) { $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.'); } else { - $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } } else { $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname); |