Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php

diff --cc README
Simple merge

diff --cc actions/confirmaddress.php
index f92db3ec452b3deccc72321352553387da80d466,5617c5339203610d56566f68c48f3c16274b8960..fd04c313075dcbdb67c4ae34e8e94d5c90b313c5
--- 1/actions/confirmaddress.php
--- 2/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@@ -86,76 -87,40 +87,77 @@@ class ConfirmaddressAction extends Acti
              return;
          }
          $type = $confirm->address_type;
 -        if (!in_array($type, array('email', 'jabber', 'sms'))) {
 -            // TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
 -            $this->serverError(sprintf(_('Unrecognized address type %s.'), $type));
 +        $transports = array();
 +        Event::handle('GetImTransports', array(&$transports));
 +        if (!in_array($type, array('email', 'sms')) && !in_array($type, array_keys($transports))) {
 +            // TRANS: Server error for an unknown address type, which can be 'email', 'sms', or the name of an IM network (such as 'xmpp' or 'aim')
 +            $this->serverError(sprintf(_('Unrecognized address type %s'), $type));
              return;
          }
 -        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;
 -        }
 -
 +        $this->address = $confirm->address;
          $cur->query('BEGIN');
 +        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;
 +            }
 +
 +            $orig_user = clone($cur);
 +
 +            $cur->$type = $confirm->address;
 +
 +            if ($type == 'sms') {
 +                $cur->carrier  = ($confirm->address_extra)+0;
 +                $carrier       = Sms_carrier::staticGet($cur->carrier);
 +                $cur->smsemail = $carrier->toEmailAddress($cur->sms);
 +            }
 +
 +            $result = $cur->updateKeys($orig_user);
 +
 +            if (!$result) {
 +                common_log_db_error($cur, 'UPDATE', __FILE__);
 +                $this->serverError(_('Couldn\'t update user.'));
 +                return;
 +            }
 +
 +            if ($type == 'email') {
 +                $cur->emailChanged();
 +            }
 +
 +        } else {
 +
 +            $user_im_prefs = new User_im_prefs();
 +            $user_im_prefs->transport = $confirm->address_type;
 +            $user_im_prefs->user_id = $cur->id;
 +            if ($user_im_prefs->find() && $user_im_prefs->fetch()) {
 +                if($user_im_prefs->screenname == $confirm->address){
 +                    $this->clientError(_('That address has already been confirmed.'));
 +                    return;
 +                }
 +                $user_im_prefs->screenname = $confirm->address;
 +                $result = $user_im_prefs->update();
 +
 +                if (!$result) {
 +                    common_log_db_error($user_im_prefs, 'UPDATE', __FILE__);
 +                    $this->serverError(_('Couldn\'t update user im preferences.'));
 +                    return;
 +                }
 +            }else{
 +                $user_im_prefs = new User_im_prefs();
 +                $user_im_prefs->screenname = $confirm->address;
 +                $user_im_prefs->transport = $confirm->address_type;
 +                $user_im_prefs->user_id = $cur->id;
 +                $result = $user_im_prefs->insert();
 +
 +                if (!$result) {
 +                    common_log_db_error($user_im_prefs, 'INSERT', __FILE__);
 +                    $this->serverError(_('Couldn\'t insert user im preferences.'));
 +                    return;
 +                }
 +            }
  
 -        $orig_user = clone($cur);
 -
 -        $cur->$type = $confirm->address;
 -
 -        if ($type == 'sms') {
 -            $cur->carrier  = ($confirm->address_extra)+0;
 -            $carrier       = Sms_carrier::staticGet($cur->carrier);
 -            $cur->smsemail = $carrier->toEmailAddress($cur->sms);
 -        }
 -
 -        $result = $cur->updateKeys($orig_user);
 -
 -        if (!$result) {
 -            common_log_db_error($cur, 'UPDATE', __FILE__);
 -            // TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
 -            $this->serverError(_('Couldn\'t update user.'));
 -            return;
 -        }
 -
 -        if ($type == 'email') {
 -            $cur->emailChanged();
          }
  
          $result = $confirm->delete();
@@@ -189,11 -158,13 +193,12 @@@
      function showContent()
      {
          $cur  = common_current_user();
 -        $type = $this->type;
  
          $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.'),
 -                               $cur->$type));
 +                               $this->address));
      }
  }

diff --cc actions/othersettings.php
index 8d6e0040470ff451d7f8426eeb9d6aef4ffa0b48,13460a4bfbd4822fd922e99066a7ebe7ada716b1..4dfc5c28402a9068e02abd4394fdc9a9c957642e
--- 1/actions/othersettings.php
--- 2/actions/othersettings.php
+++ b/actions/othersettings.php
@@@ -121,25 -124,14 +126,27 @@@ class OthersettingsAction extends Accou
              $this->elementEnd('li');
          }
          $this->elementStart('li');
 +        $this->input('maxurllength',
 +                     _('URL longer than'),
 +                     (!is_null($this->arg('maxurllength'))) ?
 +                     $this->arg('maxurllength') : User_urlshortener_prefs::maxUrlLength($user),
 +                     _('URLs longer than this will be shortened.'));
 +        $this->elementEnd('li');
 +        $this->elementStart('li');
 +        $this->input('maxnoticelength',
 +                     _('Text longer than'),
 +                     (!is_null($this->arg('maxnoticelength'))) ?
 +                     $this->arg('maxnoticelength') : User_urlshortener_prefs::maxNoticeLength($user),
 +                     _('URLs in notices longer than this will be shortened.'));
 +        $this->elementEnd('li');
 +        $this->elementStart('li');
+         // TRANS: Label for checkbox.
          $this->checkbox('viewdesigns', _('View profile designs'),
 -                        // TRANS: Tooltip for checkbox.
 -                        $user->viewdesigns, _('Show or hide profile designs.'));
 +                         -                        $user->viewdesigns, _('Show or hide profile designs.'));
          $this->elementEnd('li');
          $this->elementEnd('ul');
-         $this->submit('save', _('Save'));
+         // TRANS: Button text for saving "Other settings" in profile.
+         $this->submit('save', _m('BUTTON','Save'));
          $this->elementEnd('fieldset');
          $this->elementEnd('form');
      }

diff --cc actions/showstream.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc lib/command.php
Simple merge