X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fremovepeopletag.php;h=d27175f566ab7f3d17f8ca56edfea14d8583931a;hb=0cbb7411a69f63a4c2947d5c66e62f28e0714532;hp=aa8ae2b6ad469091efddb67d9494788cc8a421f5;hpb=e75c9988ebe33822e493ac225859bc593ff9b855;p=quix0rs-gnu-social.git diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php index aa8ae2b6ad..d27175f566 100644 --- a/actions/removepeopletag.php +++ b/actions/removepeopletag.php @@ -53,7 +53,6 @@ require_once INSTALLDIR . '/lib/togglepeopletag.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 * @link http://status.net/ */ - class RemovepeopletagAction extends Action { var $user; @@ -67,7 +66,6 @@ class RemovepeopletagAction extends Action * * @return boolean success flag */ - function prepare($args) { parent::prepare($args); @@ -77,6 +75,7 @@ class RemovepeopletagAction 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; @@ -87,6 +86,7 @@ class RemovepeopletagAction extends Action $this->user = common_current_user(); if (empty($this->user)) { + // TRANS: Error message displayed when trying to perform an action that requires a logged in user. $this->clientError(_('Not logged in.')); return false; } @@ -98,6 +98,7 @@ class RemovepeopletagAction extends Action $this->tagged = Profile::staticGet('id', $tagged_id); if (empty($this->tagged)) { + // TRANS: Client error displayed when referring to a non-existing profile. $this->clientError(_('No such profile.')); return false; } @@ -106,18 +107,8 @@ class RemovepeopletagAction extends Action $this->peopletag = Profile_list::staticGet('id', $id); if (empty($this->peopletag)) { - $this->clientError(_('No such peopletag.')); - 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)) { - $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; } @@ -133,7 +124,6 @@ class RemovepeopletagAction extends Action * * @return void */ - function handle($args) { // Throws exception on error @@ -145,10 +135,14 @@ class RemovepeopletagAction extends Action $user = User::staticGet('id', $this->tagged->id); if ($user) { $this->clientError( - sprintf(_('There was an unexpected error while tagging %s'), + // 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 delisting %s.'), $user->nickname)); } else { - $this->clientError(sprintf(_('There was a problem tagging %s.' . + // 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 listing %s. ' . 'The remote server is probably not responding correctly, ' . 'please try retrying later.'), $this->profile->profileurl)); } @@ -157,7 +151,8 @@ class RemovepeopletagAction extends Action if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); - $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);