Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / plugins / CasAuthentication / caslogin.php

diff --git a/plugins/CasAuthentication/caslogin.php b/plugins/CasAuthentication/caslogin.php
index be6967381069a7e3c27a2d55fdd60f7414b34b23..0e16427184b45ee03fe3d1cee6a1d4bd66694436 100644 (file)
--- a/plugins/CasAuthentication/caslogin.php
+++ b/plugins/CasAuthentication/caslogin.php
@@ -25,6 +25,7 @@ class CasloginAction extends Action
     {
         parent::handle($args);
         if (common_is_real_login()) {
+            // TRANS: Client error displayed when trying to log in while already logged on.
             $this->clientError(_m('Already logged in.'));
         } else {
             global $casSettings;
@@ -36,13 +37,15 @@ class CasloginAction extends Action
             $casTempPassword = common_good_rand(16);
             $user = common_check_user(phpCAS::getUser(), $casTempPassword);
             if (!$user) {
-                $this->serverError(_('Incorrect username or password.'));
+                // TRANS: Server error displayed when trying to log in with incorrect username or password.
+                $this->serverError(_m('Incorrect username or password.'));
                 return;
             }
 
             // success!
             if (!common_set_user($user)) {
-                $this->serverError(_('Error setting user. You are probably not authorized.'));
+                // TRANS: Server error displayed when login fails in CAS authentication plugin.
+                $this->serverError(_m('Error setting user. You are probably not authorized.'));
                 return;
             }
 
@@ -69,7 +72,6 @@ class CasloginAction extends Action
             }
 
             common_redirect($url, 303);
-
         }
     }
 }