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

Conflicts:
	actions/apioauthauthorize.php
	lib/apioauthstore.php

1 files changed, 3 insertions, 5 deletions

diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
index 92d0f6b77..aea10e33e 100644
--- a/actions/apiaccountupdateprofile.php
+++ b/actions/apiaccountupdateprofile.php
@@ -43,10 +43,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ApiAccountUpdateProfileAction extends ApiAuthAction
 {
-
     /**
      * Take arguments for running
      *
@@ -55,7 +53,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -79,7 +76,6 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -103,6 +99,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed if a user could not be found.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
@@ -110,6 +107,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
+            // TRANS: Client error displayed if a user profile could not be found.
             $this->clientError(_('User has no profile.'));
             return;
         }
@@ -145,6 +143,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
 
         if (!$result) {
             common_log_db_error($profile, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed if a user profile could not be saved.
             $this->serverError(_('Could not save profile.'));
             return;
         }
@@ -163,5 +162,4 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
             $this->endDocument('json');
         }
     }
-
 }