forked from GNUsocial/gnu-social
		
	Merge branch 'master' of /var/www/trunk
This commit is contained in:
		| @@ -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'); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -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! | ||||
|   | ||||
		Reference in New Issue
	
	Block a user