Merge branch 'qna' into 1.0.x

[quix0rs-gnu-social.git] / plugins / GroupPrivateMessage / groupinbox.php

diff --git a/plugins/GroupPrivateMessage/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
index c7dfb966d5f10bd928c9027eb49dd7a65da8a506..e1c4fc996dee8f8e086b7cf34cafc2df484b6a9d 100644 (file)
--- a/plugins/GroupPrivateMessage/groupinbox.php
+++ b/plugins/GroupPrivateMessage/groupinbox.php
@@ -63,7 +63,7 @@ class GroupinboxAction extends GroupDesignAction
         $cur = common_current_user();
 
         if (empty($cur)) {
-            throw new ClientException(_('Only for logged-in users'), 403);
+            throw new ClientException(_m('Only for logged-in users.'), 403);
         }
 
         $nicknameArg = $this->trimmed('nickname');
@@ -79,17 +79,17 @@ class GroupinboxAction extends GroupDesignAction
         $localGroup = Local_group::staticGet('nickname', $nickname);
 
         if (empty($localGroup)) {
-            throw new ClientException(_('No such group'), 404);
+            throw new ClientException(_m('No such group.'), 404);
         }
 
         $this->group = User_group::staticGet('id', $localGroup->group_id);
 
         if (empty($this->group)) {
-            throw new ClientException(_('No such group'), 404);
+            throw new ClientException(_m('No such group.'), 404);
         }
 
         if (!$cur->isMember($this->group)) {
-            throw new ClientException(_('Only for members'), 403);
+            throw new ClientException(_m('Only for members.'), 403);
         }
 
         $this->page = $this->trimmed('page');
@@ -121,6 +121,9 @@ class GroupinboxAction extends GroupDesignAction
         $gml = new GroupMessageList($this, $this->gm);
         $cnt = $gml->show();
 
+        if ($cnt == 0) {
+            $this->element('p', 'guide', _m('This group has not received any private messages.'));
+        }
         $this->pagination($this->page > 1,
                           $cnt > MESSAGES_PER_PAGE,
                           $this->page,
@@ -164,13 +167,42 @@ class GroupinboxAction extends GroupDesignAction
         $base = $this->group->getFancyName();
 
         if ($this->page == 1) {
-            return sprintf(_('%s group inbox'), $base);
+            return sprintf(_m('%s group inbox'), $base);
         } else {
             // TRANS: Page title for any but first group page.
             // TRANS: %1$s is a group name, $2$s is a page number.
-            return sprintf(_('%1$s group inbox, page %2$d'),
+            return sprintf(_m('%1$s group inbox, page %2$d'),
                            $base,
                            $this->page);
         }
     }
+
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+
+    function showPageNotice()
+    {
+        $instr  = $this->getInstructions();
+        $output = common_markup_to_html($instr);
+
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Instructions for using this page
+     *
+     * @return string localised instructions for using the page
+     */
+    function getInstructions()
+    {
+        // TRANS: Instructions for user inbox page.
+        return _m('This is the group inbox, which lists all incoming private messages for this group.');
+    }
 }