X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fconfirmaddress.php;h=ef4cd7cb0d124862f4437a88b9ee8ceb3ce8cb11;hb=0e439117a75698629c5066d0241ab41dc07b5ee1;hp=f92db3ec452b3deccc72321352553387da80d466;hpb=5c4723919fa757b3e14a59350415cfe53e0900d1;p=quix0rs-gnu-social.git diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index f92db3ec45..ef4cd7cb0d 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -44,7 +44,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 ConfirmaddressAction extends Action { /** type of confirmation. */ @@ -61,7 +60,6 @@ class ConfirmaddressAction extends Action * * @return void */ - function handle($args) { parent::handle($args); @@ -72,16 +70,19 @@ class ConfirmaddressAction extends Action } $code = $this->trimmed('code'); if (!$code) { + // TRANS: Client error displayed when not providing a confirmation code in the contact address confirmation action. $this->clientError(_('No confirmation code.')); return; } $confirm = Confirm_address::staticGet('code', $code); if (!$confirm) { + // TRANS: Client error displayed when providing a non-existing confirmation code in the contact address confirmation action. $this->clientError(_('Confirmation code not found.')); return; } $cur = common_current_user(); if ($cur->id != $confirm->user_id) { + // TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action. $this->clientError(_('That confirmation code is not for you!')); return; } @@ -98,6 +99,7 @@ class ConfirmaddressAction extends Action if (in_array($type, array('email', 'sms'))) { if ($cur->$type == $confirm->address) { + // TRANS: Client error for an already confirmed email/jabber/sms address. $this->clientError(_('That address has already been confirmed.')); return; } @@ -116,7 +118,8 @@ class ConfirmaddressAction extends Action if (!$result) { common_log_db_error($cur, 'UPDATE', __FILE__); - $this->serverError(_('Couldn\'t update user.')); + // TRANS: Server error displayed when confirming an e-mail address or IM address fails. + $this->serverError(_('Could not update user.')); return; } @@ -131,6 +134,7 @@ class ConfirmaddressAction extends Action $user_im_prefs->user_id = $cur->id; if ($user_im_prefs->find() && $user_im_prefs->fetch()) { if($user_im_prefs->screenname == $confirm->address){ + // TRANS: Client error for an already confirmed IM address. $this->clientError(_('That address has already been confirmed.')); return; } @@ -139,7 +143,8 @@ class ConfirmaddressAction extends Action if (!$result) { common_log_db_error($user_im_prefs, 'UPDATE', __FILE__); - $this->serverError(_('Couldn\'t update user im preferences.')); + // TRANS: Server error displayed when updating IM preferences fails. + $this->serverError(_('Could not update user IM preferences.')); return; } }else{ @@ -151,7 +156,8 @@ class ConfirmaddressAction extends Action if (!$result) { common_log_db_error($user_im_prefs, 'INSERT', __FILE__); - $this->serverError(_('Couldn\'t insert user im preferences.')); + // TRANS: Server error displayed when adding IM preferences fails. + $this->serverError(_('Could not insert user IM preferences.')); return; } } @@ -162,7 +168,9 @@ class ConfirmaddressAction extends Action if (!$result) { common_log_db_error($confirm, 'DELETE', __FILE__); - $this->serverError(_('Couldn\'t delete email confirmation.')); + // TRANS: Server error displayed when an address confirmation code deletion from the + // TRANS: database fails in the contact address confirmation action. + $this->serverError(_('Could not delete address confirmation.')); return; } @@ -175,9 +183,9 @@ class ConfirmaddressAction extends Action * * @return string title */ - function title() { + // TRANS: Title for the contact address confirmation action. return _('Confirm address'); } @@ -186,12 +194,13 @@ class ConfirmaddressAction extends Action * * @return void */ - function showContent() { $cur = common_current_user(); $this->element('p', null, + // TRANS: Success message for the contact address confirmation action. + // TRANS: %s can be 'email', 'jabber', or 'sms'. sprintf(_('The address "%s" has been '. 'confirmed for your account.'), $this->address));