Merge remote-tracking branch 'statusnet/master'

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

diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php
index b5201cf2e4a88cd57194245c0a43371992cddfed..a661104d5c96b3b763304a22c6c066d1303ddc63 100644 (file)
--- a/actions/addpeopletag.php
+++ b/actions/addpeopletag.php
@@ -106,20 +106,8 @@ class AddpeopletagAction extends Action
         $this->peopletag = Profile_list::staticGet('id', $id);
 
         if (empty($this->peopletag)) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'));
-            return false;
-        }
-
-        // OMB 0.1 doesn't have a mechanism for local-server-
-        // originated tag.
-
-        $omb01 = Remote_profile::staticGet('id', $tagged_id);
-
-        if (!empty($omb01)) {
-            // TRANS: Client error displayed trying to tag an OMB 0.1 remote profile.
-            $this->clientError(_('You cannot tag an OMB 0.1'.
-                                 ' remote profile with this action.'));
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'));
             return false;
         }
 
@@ -145,24 +133,24 @@ class AddpeopletagAction extends Action
             $user = User::staticGet('id', $id);
             if ($user) {
                 $this->clientError(
-                        // TRANS: Client error displayed when an unknown error occurs while tagging a user.
+                        // TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
                         // TRANS: %s is a username.
-                        sprintf(_('There was an unexpected error while tagging %s.'),
+                        sprintf(_('There was an unexpected error while listing %s.'),
                         $user->nickname));
             } else {
-                // TRANS: Client error displayed when an unknown error occurs while tagging a user.
+                // TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
                 // TRANS: %s is a profile URL.
-                $this->clientError(sprintf(_('There was a problem tagging %s.' .
-                                      'The remote server is probably not responding correctly, ' .
-                                      'please try retrying later.'), $this->profile->profileurl));
+                $this->clientError(sprintf(_('There was a problem listing %s. ' .
+                                      'The remote server is probably not responding correctly. ' .
+                                      'Please try retrying later.'), $this->profile->profileurl));
             }
             return false;
         }
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Title after subscribing to a people tag.
-            $this->element('title', null, _('Subscribed'));
+            // TRANS: Title after adding a user to a list.
+            $this->element('title', null, _m('TITLE','Listed'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $unsubscribe = new UntagButton($this, $this->tagged, $this->peopletag);