X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapprovegroup.php;h=d46a4451c4e496e7c1b7c65150334b2798c114cb;hb=7d64d8c78cfa102b91975598ef9e574d2ef14b8c;hp=c102c64cd5e900ad0e5640a2698cea3ad51ac257;hpb=265f9af6f7e1403c5f0d97c91b70b4d77ff31caf;p=quix0rs-gnu-social.git

diff --git a/actions/approvegroup.php b/actions/approvegroup.php
index c102c64cd5..d46a4451c4 100644
--- a/actions/approvegroup.php
+++ b/actions/approvegroup.php
@@ -98,6 +98,7 @@ class ApprovegroupAction extends Action
 
         $cur = common_current_user();
         if (empty($cur)) {
+            // TRANS: Client error displayed trying to approve group membership while not logged in.
             $this->clientError(_('Must be logged in.'), 403);
             return false;
         }
@@ -105,10 +106,12 @@ class ApprovegroupAction extends Action
             if ($cur->isAdmin($this->group)) {
                 $this->profile = Profile::staticGet('id', $this->arg('profile_id'));
             } else {
+                // TRANS: Client error displayed trying to approve group membership while not a group administrator.
                 $this->clientError(_('Only group admin can approve or cancel join requests.'), 403);
                 return false;
             }
         } else {
+            // TRANS: Client error displayed trying to approve group membership without specifying a profile to approve.
             $this->clientError(_('Must specify a profile.'));
             return false;
         }
@@ -117,15 +120,19 @@ class ApprovegroupAction extends Action
                                                          'group_id' => $this->group->id));
 
         if (empty($this->request)) {
+            // TRANS: Client error displayed trying to approve group membership for a non-existing request.
+            // TRANS: %s is a nickname.
             $this->clientError(sprintf(_('%s is not in the moderation queue for this group.'), $this->profile->nickname), 403);
         }
 
         $this->approve = (bool)$this->arg('approve');
         $this->cancel = (bool)$this->arg('cancel');
         if (!$this->approve && !$this->cancel) {
+            // TRANS: Client error displayed trying to approve/deny group membership.
             $this->clientError(_('Internal error: received neither cancel nor abort.'));
         }
         if ($this->approve && $this->cancel) {
+            // TRANS: Client error displayed trying to approve/deny group membership.
             $this->clientError(_('Internal error: received both cancel and abort.'));
         }
         return true;
@@ -146,12 +153,12 @@ class ApprovegroupAction extends Action
 
         try {
             if ($this->approve) {
-                $this->profile->completeJoinGroup($this->group);
+                $this->request->complete();
             } elseif ($this->cancel) {
-                $this->profile->cancelJoinGroup($this->group);
+                $this->request->abort();
             }
         } catch (Exception $e) {
-            common_log(LOG_ERROR, "Exception canceling group sub: " . $e->getMessage());
+            common_log(LOG_ERR, "Exception canceling group sub: " . $e->getMessage());
             // TRANS: Server error displayed when cancelling a queued group join request fails.
             // TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
             $this->serverError(sprintf(_('Could not cancel request for user %1$s to join group %2$s.'),
@@ -163,15 +170,18 @@ class ApprovegroupAction extends Action
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             // TRANS: Title for leave group page after group join request is approved/disapproved.
+            // TRANS: %1$s is the user nickname, %2$s is the group nickname.
             $this->element('title', null, sprintf(_m('TITLE','%1$s\'s request for %2$s'),
                                                   $this->profile->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');
             $this->elementStart('body');
             if ($this->approve) {
-                $this->element('p', 'success', _m('Join request approved.'));
+                // TRANS: Message on page for group admin after approving a join request.
+                $this->element('p', 'success', _('Join request approved.'));
             } elseif ($this->cancel) {
-                $this->element('p', 'success', _m('Join request canceled.'));
+                // TRANS: Message on page for group admin after rejecting a join request.
+                $this->element('p', 'success', _('Join request canceled.'));
             }
             $this->elementEnd('body');
             $this->elementEnd('html');