diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-08-10 11:53:35 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-08-10 11:53:35 -0400 |
| commit | e9ed20a69d8f646bc85151c1e890f5828a966fcf (patch) | |
| tree | e72bdf25cc94c630c31863d2985b1f29b4b27414 /actions/showstream.php | |
| parent | 17dcf1c3170bc905e3b0fdffc804d6f7229ac61b (diff) | |
| parent | 14b46e2183f10359cc53d597913a878f53e23719 (diff) | |
Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index cd5d4bb70..3f603d64f 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -358,7 +358,9 @@ class ShowstreamAction extends ProfileAction } } 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); + $message .= sprintf(_('Why not [register an account](%%%%action.%s%%%%) and then nudge %s or post a notice to his or her attention.'), + (!common_config('site','openidonly')) ? 'register' : 'openidlogin', + $this->user->nickname); } $this->elementStart('div', 'guide'); @@ -387,8 +389,10 @@ class ShowstreamAction extends ProfileAction if (!(common_config('site','closed') || common_config('site','inviteonly'))) { $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' . - '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), - $this->user->nickname, $this->user->nickname); + '[Join now](%%%%action.%s%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), + $this->user->nickname, + (!common_config('site','openidonly')) ? 'register' : 'openidlogin', + $this->user->nickname); } else { $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [Laconica](http://laconi.ca/) tool. '), |