Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

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

diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index 2d9bd836c7973b058c1815e876e1687e01c4b80a..d27175f566ab7f3d17f8ca56edfea14d8583931a 100644 (file)
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -107,20 +107,8 @@ class RemovepeopletagAction 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 when trying to (un)tag an OMB 0.1 remote profile.
-            $this->clientError(_('You cannot tag or untag 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;
         }
 
@@ -147,14 +135,14 @@ class RemovepeopletagAction extends Action
             $user = User::staticGet('id', $this->tagged->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 while delisting a user.
                         // TRANS: %s is a username.
-                        sprintf(_('There was an unexpected error while tagging %s.'),
+                        sprintf(_('There was an unexpected error while delisting %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 while listing a user.
                 // TRANS: %s is a profile URL.
-                $this->clientError(sprintf(_('There was a problem tagging %s. ' .
+                $this->clientError(sprintf(_('There was a problem listing %s. ' .
                                       'The remote server is probably not responding correctly, ' .
                                       'please try retrying later.'), $this->profile->profileurl));
             }
@@ -163,8 +151,8 @@ class RemovepeopletagAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Title after untagging a people tag.
-            $this->element('title', null, _('Untagged'));
+            // TRANS: Title after removing a user from a list.
+            $this->element('title', null, _('Unlisted'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $unsubscribe = new TagButton($this, $this->tagged, $this->peopletag);