* i18n/L10n updates and FIXMEs added

* whitespace fixes

9 files changed, 35 insertions, 38 deletions

diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php
index 7187c1f3e..ed22b452f 100644
--- a/plugins/OStatus/lib/discovery.php
+++ b/plugins/OStatus/lib/discovery.php
@@ -106,7 +106,8 @@ class Discovery
             }
         }
 
-        throw new Exception('Unable to find services for '. $id);
+        // @todo Needs i18n.
+        throw new Exception('Unable to find services for '. $id '.');
     }
 
     public static function getService($links, $service) {
@@ -160,7 +161,7 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
         } else {
             $domain = parse_url($uri, PHP_URL_HOST);
         }
-        
+
         $url = 'http://'. $domain .'/.well-known/host-meta';
 
         $xrd = Discovery::fetchXrd($url);
diff --git a/plugins/OStatus/lib/hubconfqueuehandler.php b/plugins/OStatus/lib/hubconfqueuehandler.php
index c8e0b72fe..8219f8420 100644
--- a/plugins/OStatus/lib/hubconfqueuehandler.php
+++ b/plugins/OStatus/lib/hubconfqueuehandler.php
@@ -51,4 +51,3 @@ class HubConfQueueHandler extends QueueHandler
         return true;
     }
 }
-
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 967e5f6d1..bbd4ce17a 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -32,7 +32,7 @@ class MagicEnvelope
     const ENCODING = 'base64url';
 
     const NS = 'http://salmon-protocol.org/ns/magic-env';
-    
+
     private function normalizeUser($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -70,13 +70,13 @@ class MagicEnvelope
                         $keypair = $parts[1];
                     }
                 }
-                
+
                 if ($keypair) {
                     return $keypair;
                 }
             }
         }
-        throw new Exception('Unable to locate signer public key');
+        throw new Exception('Unable to locate signer public key.');
     }
 
 
@@ -92,8 +92,7 @@ class MagicEnvelope
             'sig' => $signature_alg->sign($armored_text),
             'alg' => $signature_alg->getName()
         );
-            
-            
+
     }
 
     public function toXML($env) {
@@ -105,13 +104,13 @@ class MagicEnvelope
         $xs->element('me:alg', null, $env['alg']);
         $xs->element('me:sig', null, $env['sig']);
         $xs->elementEnd('me:env');
-        
+
         $string =  $xs->getString();
         common_debug($string);
         return $string;
     }
 
-    
+
     public function unfold($env)
     {
         $dom = new DOMDocument();
@@ -137,7 +136,7 @@ class MagicEnvelope
 
         return $dom->saveXML();
     }
-    
+
     public function getAuthor($text) {
         $doc = new DOMDocument();
         if (!$doc->loadXML($text)) {
@@ -154,12 +153,12 @@ class MagicEnvelope
             }
         }
     }
-    
+
     public function checkAuthor($text, $signer_uri)
     {
         return ($this->getAuthor($text) == $signer_uri);
     }
-    
+
     public function verify($env)
     {
         if ($env['alg'] != 'RSA-SHA256') {
@@ -181,14 +180,14 @@ class MagicEnvelope
             common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage());
             return false;
         }
-        
+
         $verifier = Magicsig::fromString($keypair);
 
         if (!$verifier) {
             common_log(LOG_DEBUG, "Salmon error: unable to parse keypair");
             return false;
         }
-        
+
         return $verifier->verify($env['data'], $env['sig']);
     }
 
diff --git a/plugins/OStatus/lib/ostatusqueuehandler.php b/plugins/OStatus/lib/ostatusqueuehandler.php
index 5e318116a..9814cab9f 100644
--- a/plugins/OStatus/lib/ostatusqueuehandler.php
+++ b/plugins/OStatus/lib/ostatusqueuehandler.php
@@ -223,4 +223,3 @@ class OStatusQueueHandler extends QueueHandler
     }
 
 }
-
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index ef7719a40..631ebc7d8 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -31,10 +31,10 @@ class Salmon
     const REL_SALMON = 'salmon';
     const REL_MENTIONED = 'mentioned';
 
-    // XXX: these are deprecated 
+    // XXX: these are deprecated
     const NS_REPLIES = "http://salmon-protocol.org/ns/salmon-replies";
     const NS_MENTIONS = "http://salmon-protocol.org/ns/salmon-mention";
-    
+
     /**
      * Sign and post the given Atom entry as a Salmon message.
      *
@@ -87,9 +87,10 @@ class Salmon
                 // No keypair yet, let's generate one.
                 $magickey = new Magicsig();
                 $magickey->generate($user->id);
-            } 
+            }
         } else {
-            throw new Exception("Salmon invalid actor for signing");
+            // @todo i18n FIXME: added i18n and use sprintf when using parameters.
+            throw new Exception("Salmon invalid actor for signing.");
         }
 
         try {
@@ -104,7 +105,7 @@ class Salmon
     public function verifyMagicEnv($text)
     {
         $magic_env = new MagicEnvelope();
-        
+
         $env = $magic_env->parse($text);
 
         return $magic_env->verify($env);
diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 9d6c6b269..5fdb11abe 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -42,7 +42,7 @@ class SalmonAction extends Action
         }
 
         if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') {
-            $this->clientError(_m('Salmon requires application/magic-envelope+xml'));
+            $this->clientError(_m('Salmon requires "application/magic-envelope+xml".'));
         }
 
         $xml = file_get_contents('php://input');
diff --git a/plugins/OStatus/lib/salmonqueuehandler.php b/plugins/OStatus/lib/salmonqueuehandler.php
index 7eeb5f8e9..56d3c9eff 100644
--- a/plugins/OStatus/lib/salmonqueuehandler.php
+++ b/plugins/OStatus/lib/salmonqueuehandler.php
@@ -36,7 +36,7 @@ class SalmonQueueHandler extends QueueHandler
         assert(is_string($data['entry']));
 
         $actor = Profile::staticGet($data['actor']);
-        
+
         $salmon = new Salmon();
         $salmon->post($data['salmonuri'], $data['entry'], $actor);
 
diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php
index a10b9f427..145cd64cb 100644
--- a/plugins/OStatus/lib/xrd.php
+++ b/plugins/OStatus/lib/xrd.php
@@ -31,11 +31,11 @@
 class XRD
 {
     const XML_NS = 'http://www.w3.org/2000/xmlns/';
-    
+
     const XRD_NS = 'http://docs.oasis-open.org/ns/xri/xrd-1.0';
 
     const HOST_META_NS = 'http://host-meta.net/xrd/1.0';
-    
+
     public $expires;
 
     public $subject;
@@ -43,11 +43,11 @@ class XRD
     public $host;
 
     public $alias = array();
-    
+
     public $types = array();
-    
+
     public $links = array();
-    
+
     public static function parse($xml)
     {
         $xrd = new XRD();
@@ -61,11 +61,11 @@ class XRD
         error_reporting($old);
 
         if (!$ok) {
-            throw new Exception("Invalid XML");
+            throw new Exception("Invalid XML.");
         }
         $xrd_element = $dom->getElementsByTagName('XRD')->item(0);
         if (!$xrd_element) {
-            throw new Exception("Invalid XML, missing XRD root");
+            throw new Exception("Invalid XML, missing XRD root.");
         }
 
         // Check for host-meta host
@@ -86,7 +86,7 @@ class XRD
             case 'Subject':
                 $xrd->subject = $node->nodeValue;
                 break;
-                
+
             case 'Alias':
                 $xrd->alias[] = $node->nodeValue;
                 break;
@@ -114,7 +114,7 @@ class XRD
         if ($this->host) {
             $xs->element('hm:Host', array('xmlns:hm' => XRD::HOST_META_NS), $this->host);
         }
-        
+
         if ($this->expires) {
             $xs->element('Expires', null, $this->expires);
         }
@@ -139,7 +139,7 @@ class XRD
             }
             $xs->elementEnd('Link');
         }
-        
+
         $xs->elementEnd('XRD');
 
         return $xs->getString();
@@ -149,7 +149,7 @@ class XRD
     {
         return array();
     }
-    
+
     function parseLink($element)
     {
         $link = array();
@@ -169,4 +169,3 @@ class XRD
         return $link;
     }
 }
-
diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php
index d8cf648d6..91bb87cc2 100644
--- a/plugins/OStatus/lib/xrdaction.php
+++ b/plugins/OStatus/lib/xrdaction.php
@@ -26,13 +26,12 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class XrdAction extends Action
 {
-
     public $uri;
-    
+
     public $user;
 
     public $xrd;
-    
+
     function handle()
     {
         $nick =  $this->user->nickname;