class ImsettingsAction extends SettingsAction {
function get_instructions() {
- return _('You can send and receive notices through '.
- 'Jabber/GTalk [instant messages](%%doc.im%%). Configure '.
- 'your address and settings below.');
+ return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
}
function show_form($msg=NULL, $success=false) {
common_element_start('p');
common_element('span', 'address unconfirmed', $confirm->address);
common_element('span', 'input_instructions',
- sprintf(_('Awaiting confirmation on this address. Check your ' .
- 'Jabber/GTalk account for a message with further ' .
- 'instructions. (Did you add %s to your buddy list?)',
- jabber_daemon_address())));
+ sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
common_hidden('jabber', $confirm->address);
common_element_end('p');
common_submit('cancel', _('Cancel'));
} else {
common_input('jabber', _('IM Address'),
($this->arg('jabber')) ? $this->arg('jabber') : NULL,
- sprintf(_('Jabber or GTalk address, like "UserName@example.org". ' .
- 'First, make sure to add %s' .
- ' to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
+ sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
common_submit('add', _('Add'));
}
}
common_checkbox('updatefrompresence',
_('Post a notice when my Jabber/GTalk status changes.'),
$user->updatefrompresence);
+ common_checkbox('jabberreplies',
+ _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
+ $user->jabberreplies);
+ common_checkbox('jabbermicroid',
+ _('Publish a MicroID for my Jabber/GTalk address.'),
+ $user->jabbermicroid);
common_submit('save', _('Save'));
common_element_end('form');
$jabbernotify = $this->boolean('jabbernotify');
$updatefrompresence = $this->boolean('updatefrompresence');
+ $jabberreplies = $this->boolean('jabberreplies');
+ $jabbermicroid = $this->boolean('jabbermicroid');
$user = common_current_user();
$user->jabbernotify = $jabbernotify;
$user->updatefrompresence = $updatefrompresence;
+ $user->jabberreplies = $jabberreplies;
+ $user->jabbermicroid = $jabbermicroid;
$result = $user->update($original);
if ($result === FALSE) {
common_log_db_error($user, 'UPDATE', __FILE__);
- common_server_error(_('Couldnt update user.'));
+ common_server_error(_('Couldn\'t update user.'));
return;
}
if ($result === FALSE) {
common_log_db_error($confirm, 'INSERT', __FILE__);
- common_server_error(_('Couldnt insert confirmation code.'));
+ common_server_error(_('Couldn\'t insert confirmation code.'));
return;
}
$user->nickname,
$jabber);
}
-
- # XXX: I18N
- $msg = 'A confirmation code was sent to the IM address you added. ' .
- ' You must approve ' . jabber_daemon_address() .
- ' for sending messages to you.';
+ $msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
$this->show_form($msg, TRUE);
}
$result = $user->updateKeys($original);
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
- common_server_error(_('Couldnt update user.'));
+ common_server_error(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');