diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-01-23 03:16:31 +0000 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-01-23 03:16:31 +0000 |
commit | 12d923df113316067efe5f024449475d3ba78ffc (patch) | |
tree | 5d8d5cdb5cdb9260ad7df970847e136945fa5705 | |
parent | adf77944e84a1d08bcc3d2a89533dff5bc58f3e3 (diff) | |
parent | b09a58e8dc07995398baa79f0e90df7698780f4d (diff) |
Merge branch 'master' of /var/www/trunk
-rw-r--r-- | actions/public.php | 10 | ||||
-rw-r--r-- | actions/showstream.php | 12 |
2 files changed, 22 insertions, 0 deletions
diff --git a/actions/public.php b/actions/public.php index c2e90c3b5..395d28819 100644 --- a/actions/public.php +++ b/actions/public.php @@ -209,4 +209,14 @@ class PublicAction extends Action $feat = new FeaturedUsersSection($this); $feat->show(); } + + function showAnonymousMessage() + { + $m = _('This is %%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 share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))'); + $this->elementStart('p', 'anonymous'); + $this->raw(common_markup_to_html($m)); + $this->elementEnd('p'); + } } diff --git a/actions/showstream.php b/actions/showstream.php index 9e209cd4a..3bccdcb1a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -531,6 +531,18 @@ class ShowstreamAction extends Action $this->elementEnd('div'); } + + function showAnonymousMessage() + { + $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); + $this->elementStart('p', 'anonymous'); + $this->raw(common_markup_to_html($m)); + $this->elementEnd('p'); + } + } // We don't show the author for a profile, since we already know who it is! |