Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

2 files changed, 18 insertions, 16 deletions

diff --git a/actions/public.php b/actions/public.php
index 96c766a57..fca90488f 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -184,25 +184,9 @@ class PublicAction extends Action
 
         if (common_logged_in()) {
             $message .= _('Be the first to post!');
-/*
-                sprintf(_('You are logged in... %%%%site.name%%%% groups let you find and talk with ' .
-                    'people of similar interests. After you join a group ' .
-                    'you can send messages to all other members using the ' .
-                    'syntax "!groupname". Don\'t see a group you like? Try ' .
-                    '[searching for one](%%%%action.groupsearch%%%%) or ' .
-                    '[start your own!](%%%%action.newgroup%%%%)'));
-*/
         }
         else {
             $message .= _('Why not [register an account](%%action.register%%) and be the first to post!');
-/*
-                sprintf(_('You are not logged in... %%%%site.name%%%% groups let you find and talk with ' .
-                    'people of similar interests. After you join a group ' .
-                    'you can send messages to all other members using the ' .
-                    'syntax "!groupname". Don\'t see a group you like? Try ' .
-                    '[searching for one](%%%%action.groupsearch%%%%) or ' .
-                    '[start your own!](%%%%action.newgroup%%%%)'));
-*/
         }
 
         $this->elementStart('div', 'blankfiller');
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 6f5fc7541..5322372b2 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -62,6 +62,24 @@ class PublictagcloudAction extends Action
         $this->element('p', 'instructions',
                        sprintf(_('These are most popular recent tags on %s '),
                                common_config('site', 'name')));
+
+        $tags = new Notice_tag();
+        if ($tags->count()) {
+            return;
+        }
+
+        $message = _('Noone has posted a notice with a [hashtag](%%doc.tags%%) yet.') . ' ';
+
+        if (common_logged_in()) {
+            $message .= _('Be the first to post one!');
+        }
+        else {
+            $message .= _('Why not [register an account](%%action.register%%) and be the first to post one!');
+        }
+
+        $this->elementStart('div', 'blankfiller');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
     }
 
     function showLocalNav()