Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / actions / subscribepeopletag.php

diff --git a/actions/subscribepeopletag.php b/actions/subscribepeopletag.php
index e38ecb2d3ee51d2a2ee8c5437c3eb451d16fe8ac..dee0384c5d04040004887ab948ec5d1067e7667d 100644 (file)
--- a/actions/subscribepeopletag.php
+++ b/actions/subscribepeopletag.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class SubscribepeopletagAction extends Action
 {
     var $peopletag = null;
@@ -51,18 +50,19 @@ class SubscribepeopletagAction extends Action
     /**
      * Prepare to run
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->clientError(_('You must be logged in to unsubscribe to a peopletag.'));
+            // TRANS: Client error displayed when trying to perform an action while not logged in.
+            $this->clientError(_('You must be logged in to unsubscribe from a list.'));
             return false;
         }
         // Only allow POST requests
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed when trying to use another method than POST.
             $this->clientError(_('This action only accepts POST requests.'));
             return false;
         }
@@ -72,6 +72,7 @@ class SubscribepeopletagAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token.'.
                                  ' Try again, please.'));
             return false;
@@ -84,12 +85,14 @@ class SubscribepeopletagAction extends Action
         if ($id) {
             $this->peopletag = Profile_list::staticGet('id', $id);
         } else {
+            // TRANS: Client error displayed when trying to perform an action without providing an ID.
             $this->clientError(_('No ID given.'), 404);
             return false;
         }
 
         if (!$this->peopletag || $this->peopletag->private) {
-            $this->clientError(_('No such peopletag.'), 404);
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 
@@ -117,14 +120,18 @@ class SubscribepeopletagAction extends Action
         try {
             Profile_tag_subscription::add($this->peopletag, $cur);
         } catch (Exception $e) {
-            $this->serverError(sprintf(_('Could not subscribe user %1$s to peopletag %2$s.'),
-                                       $cur->nickname, $this->peopletag->tag) . ' ' . $e->getMessage());
+            // TRANS: Server error displayed subscribing to a list fails.
+            // TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+            $this->serverError(sprintf(_('Could not subscribe user %1$s to list %2$s: %3$s'),
+                                       $cur->nickname, $this->peopletag->tag), $e->getMessage());
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%1$s subscribed to peopletag %2$s by %3$s'),
+            // TRANS: Title of form to subscribe to a list.
+            // TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+            $this->element('title', null, sprintf(_('%1$s subscribed to list %2$s by %3$s'),
                                                   $cur->nickname,
                                                   $this->peopletag->tag,
                                                   $this->tagger->nickname));