Merge branch 'master' into testing

[quix0rs-gnu-social.git] / plugins / FacebookBridge / actions / facebooklogin.php

diff --git a/plugins/FacebookBridge/actions/facebooklogin.php b/plugins/FacebookBridge/actions/facebooklogin.php
index f8a45c41b2969ebdb0c1803bf6f00026198a045c..fa3cc7a6f2a27f8fc7f201a016b6bfbe66cc427c 100644 (file)
--- a/plugins/FacebookBridge/actions/facebooklogin.php
+++ b/plugins/FacebookBridge/actions/facebooklogin.php
@@ -34,12 +34,12 @@ if (!defined('STATUSNET')) {
 
 class FacebookloginAction extends Action
 {
-
     function handle($args)
     {
         parent::handle($args);
 
         if (common_is_real_login()) {
+            // TRANS: Client error displayed when trying to login while already logged in.
             $this->clientError(_m('Already logged in.'));
         } else {
             $this->showPage();
@@ -48,7 +48,7 @@ class FacebookloginAction extends Action
 
     function getInstructions()
     {
-        // TRANS: Instructions.
+        // TRANS: Form instructions.
         return _m('Login with your Facebook Account');
     }
 
@@ -68,7 +68,6 @@ class FacebookloginAction extends Action
     }
 
     function showContent() {
-
         $this->elementStart('fieldset');
 
         $facebook = Facebookclient::getFacebook();
@@ -89,12 +88,11 @@ class FacebookloginAction extends Action
         );
 
         $attrs = array(
-            'src' => common_path(
-                'plugins/FacebookBridge/images/login-button.png',
-                true
-            ),
-            'alt'   => 'Login with Facebook',
-            'title' => 'Login with Facebook'
+            'src' => Plugin::staticPath('FacebookBridge', 'images/login-button.png'),
+            // TRANS: Alt text for "Login with Facebook" image.
+            'alt'   => _m('Login with Facebook'),
+            // TRANS: Title for "Login with Facebook" image.
+            'title' => _m('Login with Facebook.')
         );
 
         $this->element('img', $attrs);
@@ -120,4 +118,3 @@ class FacebookloginAction extends Action
         $nav->show();
     }
 }
-