* @see SettingsAction
*/
-class ImsettingsAction extends ConnectSettingsAction
+class ImsettingsAction extends SettingsAction
{
/**
* Title of the page
*
* @return string Title of the page
*/
-
function title()
{
- // TRANS: Title for instance messaging settings.
+ // TRANS: Title for Instant Messaging settings.
return _('IM settings');
}
*
* @return instructions for use
*/
-
function getInstructions()
{
// TRANS: Instant messaging settings page instructions.
*
* @return void
*/
-
function showContent()
{
$transports = array();
'message with further instructions. '.
'(Did you add %s to your buddy list?)'),
$transport_info['display'],
- $transport_info['daemon_screenname']));
+ $transport_info['daemonScreenname']));
$this->hidden('screenname', $confirm->address);
// TRANS: Button label to cancel an IM address confirmation procedure.
$this->submit('cancel', _m('BUTTON','Cancel'));
*
* @return Confirm_address address object for this user
*/
+<<<<<<< HEAD
function getConfirmation($transport)
+=======
+ function getConfirmation()
+>>>>>>> 0.9.x
{
$user = common_current_user();
*
* @return void
*/
-
function handlePost()
{
// CSRF protection
} else if ($this->arg('remove')) {
$this->removeAddress();
} else {
- // TRANS: Message given submitting a form with an unknown action in IM settings.
+ // TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
$this->showForm(_('Unexpected form submission.'));
}
}
*
* @return void
*/
-
function savePreferences()
{
$user = common_current_user();
*
* @return void
*/
-
function addAddress()
{
$user = common_current_user();
if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
- // TRANS: Server error thrown on database error adding IM confirmation code.
- $this->serverError(_('Couldn\'t insert confirmation code.'));
+ // TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
+ $this->serverError(_('Could not insert confirmation code.'));
return;
}
*
* @return void
*/
-
function cancelConfirmation()
{
$screenname = $this->trimmed('screenname');
$confirm = $this->getConfirmation($transport);
if (!$confirm) {
- // TRANS: Message given canceling IM address confirmation that is not pending.
+ // TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
$this->showForm(_('No pending confirmation to cancel.'));
return;
}
*
* @return void
*/
-
function removeAddress()
{
$user = common_current_user();
// XXX: unsubscribe to the old address
- // TRANS: Message given after successfully removing a registered IM address.
+ // TRANS: Message given after successfully removing a registered Instant Messaging address.
$this->showForm(_('The IM address was removed.'), true);
}