Merge branch '2828' into 0.9.x

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatusinit.php

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 22aea9f7097831faf5aafee5944b800d1ef56cac..91c36203c88ff8d0d6accae6a6f482f7a031177e 100644 (file)
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -22,12 +22,12 @@
  * @maintainer James Walker <james@status.net>
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class OStatusInitAction extends Action
 {
-
     var $nickname;
     var $group;
     var $profile;
@@ -38,6 +38,7 @@ class OStatusInitAction extends Action
         parent::prepare($args);
 
         if (common_logged_in()) {
+            // TRANS: Client error.
             $this->clientError(_m('You can use the local subscription!'));
             return false;
         }
@@ -45,13 +46,13 @@ class OStatusInitAction extends Action
         // Local user or group the remote wants to subscribe to
         $this->nickname = $this->trimmed('nickname');
         $this->group = $this->trimmed('group');
-        
+
         // Webfinger or profile URL of the remote user
         $this->profile = $this->trimmed('profile');
 
         return true;
     }
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -69,7 +70,7 @@ class OStatusInitAction extends Action
             $this->showForm();
         }
     }
-    
+
     function showForm($err = null)
     {
         $this->err = $err;
@@ -78,6 +79,7 @@ class OStatusInitAction extends Action
             $this->xw->startDocument('1.0', 'UTF-8');
             $this->elementStart('html');
             $this->elementStart('head');
+            // TRANS: Form title.
             $this->element('title', null, _m('Subscribe to user'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -92,11 +94,15 @@ class OStatusInitAction extends Action
     function showContent()
     {
         if ($this->group) {
+            // TRANS: Form legend.
             $header = sprintf(_m('Join group %s'), $this->group);
-            $submit = _m('Join');
+            // TRANS: Button text.
+            $submit = _m('BUTTON','Join');
         } else {
+            // TRANS: Form legend.
             $header = sprintf(_m('Subscribe to %s'), $this->nickname);
-            $submit = _m('Subscribe');
+            // TRANS: Button text.
+            $submit = _m('BUTTON','Subscribe');
         }
         $this->elementStart('form', array('id' => 'form_ostatus_connect',
                                           'method' => 'post',
@@ -108,13 +114,16 @@ class OStatusInitAction extends Action
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li', array('id' => 'ostatus_nickname'));
+        // TRANS: Field label.
         $this->input('nickname', _m('User nickname'), $this->nickname,
-                     _m('Nickname of the user you want to follow'));
+                     _m('Nickname of the user you want to follow.'));
         $this->hidden('group', $this->group); // pass-through for magic links
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
+        // TRANS: Field label.
         $this->input('profile', _m('Profile Account'), $this->profile,
-                     _m('Your account id (i.e. user@identi.ca)'));
+                      // TRANS: Tooltip for field label "Profile Account".
+                     _m('Your account id (e.g. user@identi.ca).'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', $submit);
@@ -135,6 +144,7 @@ class OStatusInitAction extends Action
         } elseif (strpos($this->profile, '@') !== false) {
             $this->connectWebfinger($this->profile);
         } else {
+            // TRANS: Client error.
             $this->clientError(_m("Must provide a remote profile."));
         }
     }
@@ -146,6 +156,7 @@ class OStatusInitAction extends Action
         $disco = new Discovery;
         $result = $disco->lookup($acct);
         if (!$result) {
+            // TRANS: Client error.
             $this->clientError(_m("Couldn't look up OStatus account profile."));
         }
 
@@ -158,6 +169,7 @@ class OStatusInitAction extends Action
             }
 
         }
+        // TRANS: Client error.
         $this->clientError(_m("Couldn't confirm remote profile address."));
     }
 
@@ -183,6 +195,7 @@ class OStatusInitAction extends Action
             if ($user) {
                 return common_local_url('userbyid', array('id' => $user->id));
             } else {
+                // TRANS: Client error.
                 $this->clientError("No such user.");
             }
         } else if ($this->group) {
@@ -190,16 +203,18 @@ class OStatusInitAction extends Action
             if ($group) {
                 return common_local_url('groupbyid', array('id' => $group->group_id));
             } else {
+                // TRANS: Client error.
                 $this->clientError("No such group.");
             }
         } else {
+            // TRANS: Client error.
             $this->clientError("No local user or group nickname provided.");
         }
     }
 
     function title()
     {
-      return _m('OStatus Connect');  
+      // TRANS: Page title.
+      return _m('OStatus Connect');
     }
-  
 }