X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnudge.php;h=0ca3753dc7bc03427138f3163322f42bf93684f8;hb=bc554ea9c233943e7b1077d724aa8070fdb7b0f9;hp=32ae8587cc5567d6da8fc36a9d5c71e8bb344e99;hpb=e10621a52ae25bbcde8bdf381ef4f5b9b85dc48d;p=quix0rs-gnu-social.git diff --git a/actions/nudge.php b/actions/nudge.php index 32ae8587cc..0ca3753dc7 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -60,12 +60,13 @@ class NudgeAction extends Action parent::handle($args); if (!common_logged_in()) { + // TRANS: Error message displayed when trying to perform an action that requires a logged in user. $this->clientError(_('Not logged in.')); return; } $user = common_current_user(); - $other = User::staticGet('nickname', $this->arg('nickname')); + $other = User::getKV('nickname', $this->arg('nickname')); if ($_SERVER['REQUEST_METHOD'] != 'POST') { common_redirect(common_local_url('showstream', @@ -77,12 +78,14 @@ class NudgeAction 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; } if (!$other->email || !$other->emailnotifynudge) { - $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set their email yet.')); + // TRANS: Client error displayed trying to nudge a user that cannot be nudged. + $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set their email address yet.')); return; } @@ -91,12 +94,14 @@ class NudgeAction extends Action if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); + // TRANS: Page title after sending a nudge. $this->element('title', null, _('Nudge sent')); $this->elementEnd('head'); $this->elementStart('body'); + // TRANS: Confirmation text after sending a nudge. $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!')); $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); } else { // display a confirmation to the user common_redirect(common_local_url('showstream', @@ -129,4 +134,3 @@ class NudgeAction extends Action return true; } } -