Merge branch 'master' of /var/www/trunk

This commit is contained in:
Robin Millette 2009-01-23 03:32:12 +00:00
commit c8b606f17e
3 changed files with 16 additions and 4 deletions

View File

@ -215,8 +215,8 @@ class PublicAction extends Action
$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->elementStart('div', 'anonymous');
$this->raw(common_markup_to_html($m));
$this->elementEnd('p');
$this->elementEnd('div');
}
}

View File

@ -372,4 +372,16 @@ class ShowgroupAction extends Action
$this->elementEnd('div');
}
function showAnonymousMessage()
{
$m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
'based on the Free Software [Laconica](http://laconi.ca/) tool. Its members share ' .
'short messages about their life and interests. '.
'[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
$this->group->nickname);
$this->elementStart('div', 'anonymous');
$this->raw(common_markup_to_html($m));
$this->elementEnd('div');
}
}

View File

@ -538,9 +538,9 @@ class ShowstreamAction extends Action
'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->elementStart('div', 'anonymous');
$this->raw(common_markup_to_html($m));
$this->elementEnd('p');
$this->elementEnd('div');
}
}