$this->clientError(_('No confirmation code.'));
return;
}
- $confirm = Confirm_address::staticGet('code', $code);
+ $confirm = Confirm_address::getKV('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.'));
if (in_array($type, array('email', 'sms')))
{
if ($cur->$type == $confirm->address) {
- // TRANS: Client error for an already confirmed email/jabber/sms address.
+ // TRANS: Client error for an already confirmed email/jabber/sms address.
$this->clientError(_('That address has already been confirmed.'));
return;
}
if ($type == 'sms') {
$cur->carrier = ($confirm->address_extra)+0;
- $carrier = Sms_carrier::staticGet($cur->carrier);
+ $carrier = Sms_carrier::getKV($cur->carrier);
$cur->smsemail = $carrier->toEmailAddress($cur->sms);
}
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;
}
$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;
}
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{
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;
}
}