* update/add translator documentation

* remove superfluous whitespace

1 files changed, 10 insertions, 23 deletions

diff --git a/lib/apiauth.php b/lib/apiauth.php
index cf7a2692c..8b0a3da17 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -68,7 +68,6 @@ require_once INSTALLDIR . '/lib/apioauth.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 ApiAuthAction extends ApiAction
 {
     var $auth_user_nickname = null;
@@ -83,7 +82,6 @@ class ApiAuthAction extends ApiAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -126,7 +124,6 @@ class ApiAuthAction extends ApiAction
      *
      * @return mixed the OAuthRequest or false
      */
-
     function getOAuthRequest()
     {
         ApiOauthAction::cleanRequest();
@@ -154,7 +151,6 @@ class ApiAuthAction extends ApiAction
      *
      * @return nothing
      */
-
     function checkOAuthRequest($request)
     {
         $datastore   = new ApiStatusNetOAuthDataStore();
@@ -164,7 +160,6 @@ class ApiAuthAction extends ApiAction
         $server->add_signature_method($hmac_method);
 
         try {
-
             $server->verify_request($request);
 
             $consumer     = $request->get_parameter('oauth_consumer_key');
@@ -176,7 +171,8 @@ class ApiAuthAction extends ApiAction
                 common_log(LOG_WARNING,
                            'Couldn\'t find the OAuth app for consumer key: ' .
                            $consumer);
-                throw new OAuthException('No application for that consumer key.');
+                // TRANS: OAuth exception thrown when no application is found for a given consumer key.
+                throw new OAuthException(_('No application for that consumer key.'));
             }
 
             // set the source attr
@@ -186,19 +182,15 @@ class ApiAuthAction extends ApiAction
             $appUser = Oauth_application_user::staticGet('token', $access_token);
 
             if (!empty($appUser)) {
-
                 // If access_type == 0 we have either a request token
                 // or a bad / revoked access token
 
                 if ($appUser->access_type != 0) {
-
                     // Set the access level for the api call
-
                     $this->access = ($appUser->access_type & Oauth_application::$writeAccess)
                       ? self::READ_WRITE : self::READ_ONLY;
 
                     // Set the auth user
-
                     if (Event::handle('StartSetApiUser', array(&$user))) {
                         $this->auth_user = User::staticGet('id', $appUser->profile_id);
                         Event::handle('EndSetApiUser', array($user));
@@ -216,13 +208,13 @@ class ApiAuthAction extends ApiAction
                                                  'read-write' : 'read-only'
                                                  ));
                 } else {
-                    throw new OAuthException('Bad access token.');
+                    // TRANS: OAuth exception given when an incorrect access token was given for a user.
+                    throw new OAuthException(_('Bad access token.'));
                 }
             } else {
-
                 // Also should not happen
-
-                throw new OAuthException('No user for that token.');
+                // TRANS: OAuth exception given when no user was found for a given token (no token was found).
+                throw new OAuthException(_('No user for that token.'));
             }
 
         } catch (OAuthException $e) {
@@ -237,7 +229,6 @@ class ApiAuthAction extends ApiAction
      *
      * @return boolean true
      */
-
     function requiresAuth()
     {
         return true;
@@ -249,7 +240,6 @@ class ApiAuthAction extends ApiAction
      *
      * @return boolean true or false
      */
-
     function checkBasicAuthUser($required = true)
     {
         $this->basicAuthProcessHeader();
@@ -264,8 +254,8 @@ class ApiAuthAction extends ApiAction
             header('WWW-Authenticate: Basic realm="' . $realm . '"');
 
             // show error if the user clicks 'cancel'
-
-            $this->clientError("Could not authenticate you.", 401, $this->format);
+            // TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+            $this->clientError(_("Could not authenticate you."), 401, $this->format);
             exit;
 
         } else {
@@ -283,13 +273,11 @@ class ApiAuthAction extends ApiAction
             }
 
             // By default, basic auth users have rw access
-
             $this->access = self::READ_WRITE;
 
             if (empty($this->auth_user) && ($required || isset($_SERVER['PHP_AUTH_USER']))) {
 
                 // basic authentication failed
-
                 list($proxy, $ip) = common_client_ip();
 
                 $msg = sprintf( 'Failed API auth attempt, nickname = %1$s, ' .
@@ -298,7 +286,8 @@ class ApiAuthAction extends ApiAction
                                $proxy,
                                $ip);
                 common_log(LOG_WARNING, $msg);
-                $this->clientError("Could not authenticate you.", 401, $this->format);
+                // TRANS: Client error thrown when authentication fails.
+                $this->clientError(_("Could not authenticate you."), 401, $this->format);
                 exit;
             }
         }
@@ -310,7 +299,6 @@ class ApiAuthAction extends ApiAction
      *
      * @return void
      */
-
     function basicAuthProcessHeader()
     {
         $authHeaders = array('AUTHORIZATION',
@@ -332,7 +320,6 @@ class ApiAuthAction extends ApiAction
 
             // Decode the HTTP_AUTHORIZATION header on php-cgi server self
             // on fcgid server the header name is AUTHORIZATION
-
             $auth_hash = base64_decode(substr($authorization_header, 6));
             list($this->auth_user_nickname,
                  $this->auth_user_password) = explode(':', $auth_hash);