Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

lib/mailhandler.php

@@ -139,7 +139,7 @@ class MailHandler
 
         $headers['From'] = $to;
         $headers['To'] = $from;
-        $headers['Subject'] = "Command complete";
+        $headers['Subject'] = _('Command complete');
 
         return mail_send(array($from), $headers, $response);
     }
@@ -225,7 +225,7 @@ class MailHandler
 
     function unsupported_type($type)
     {
-        $this->error(null, "Unsupported message type: " . $type);
+        $this->error(null, sprintf(_('Unsupported message type: %s'), $type));
     }
 
     function cleanup_msg($msg)

plugins/APCPlugin.php

@@ -104,5 +104,16 @@ class APCPlugin extends Plugin
         Event::handle('EndCacheDelete', array($key));
         return false;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'APC',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:APC',
+                            'rawdescription' =>
+                            _m('Use the <a href="http://pecl.php.net/package/apc">APC</a> variable cache to cache query results.'));
+        return true;
+    }
 }
 

plugins/Autocomplete/AutocompletePlugin.php

@@ -61,5 +61,16 @@ class AutocompletePlugin extends Plugin
         }
     }
 
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Autocomplete',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:Autocomplete',
+                            'rawdescription' =>
+                            _m('The autocomplete plugin allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user\'s friend\' screen names.'));
+        return true;
+    }
+
 }
 ?>

plugins/CasAuthentication/CasAuthenticationPlugin.php

@@ -138,4 +138,15 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         $casSettings['port']=$this->port;
         $casSettings['path']=$this->path;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'CAS Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication',
+                            'rawdescription' =>
+                            _m('The CAS Authentication plugin allows for StatusNet to handle authentication through CAS (Central Authentication Service).'));
+        return true;
+    }
 }

plugins/EmailAuthentication/EmailAuthenticationPlugin.php

@@ -50,5 +50,16 @@ class EmailAuthenticationPlugin extends Plugin
             }
         }
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Email Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:EmailAuthentication',
+                            'rawdescription' =>
+                            _m('The Email Authentication plugin allows users to login using their email address.'));
+        return true;
+    }
 }
 

plugins/FirePHP/FirePHPPlugin.php

@@ -55,5 +55,16 @@ class FirePHPPlugin extends Plugin
         $priority = $firephp_priorities[$priority];
         $this->firephp->fb($msg, $priority);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'FirePHP',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:FirePHP',
+                            'rawdescription' =>
+                            _m('The FirePHP plugin writes StatusNet\'s log output to FirePHP.'));
+        return true;
+    }
 }
 

plugins/FirePHP/README

@@ -1,4 +1,4 @@
-The FirePHP writes StatusNet's log output to FirePHP.
+The FirePHP plugin writes StatusNet's log output to FirePHP.
 
 Using FirePHP on production sites can expose sensitive information.
     You must protect the security of your application by disabling FirePHP

plugins/Gravatar/GravatarPlugin.php

@@ -185,4 +185,16 @@ class GravatarPlugin extends Plugin
                 "&size=".$size;
             return $url;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Gravatar',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Eric Helgeson',
+                            'homepage' => 'http://status.net/wiki/Plugin:Gravatar',
+                            'rawdescription' =>
+                            _m('The Gravatar plugin allows users to use their <a href="http://www.gravatar.com/">Gravatar</a> with StatusNet.'));
+
+        return true;
+    }
 }

plugins/Imap/ImapPlugin.php

@@ -82,4 +82,15 @@ class ImapPlugin extends Plugin
         }
         return true;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'IMAP',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:IMAP',
+                            'rawdescription' =>
+                            _m('The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for incoming mail containing user posts.'));
+        return true;
+    }
 }

plugins/Imap/imapdaemon.php

@@ -117,7 +117,7 @@ class IMAPMailHandler extends MailHandler
     {
         $this->log(LOG_INFO, "Error: $from $msg");
         $headers['To'] = $from;
-        $headers['Subject'] = "Error";
+        $headers['Subject'] = _m('Error');
 
         return mail_send(array($from), $headers, $msg);
     }

plugins/InfiniteScroll/InfiniteScrollPlugin.php

@@ -43,4 +43,15 @@ class InfiniteScrollPlugin extends Plugin
         $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
         $action->script('plugins/InfiniteScroll/infinitescroll.js');
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'InfiniteScroll',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:InfiniteScroll',
+                            'rawdescription' =>
+                            _m('Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.'));
+        return true;
+    }
 }

plugins/LdapAuthentication/LdapAuthenticationPlugin.php

@@ -346,4 +346,15 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
 
         return $str;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'LDAP Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:LdapAuthentication',
+                            'rawdescription' =>
+                            _m('The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP.'));
+        return true;
+    }
 }

plugins/LdapAuthorization/LdapAuthorizationPlugin.php

@@ -206,4 +206,15 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
             return false;
         }
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'LDAP Authorization',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:LdapAuthorization',
+                            'rawdescription' =>
+                            _m('The LDAP Authorization plugin allows for StatusNet to handle authorization through LDAP.'));
+        return true;
+    }
 }

plugins/Minify/MinifyPlugin.php

@@ -164,5 +164,16 @@ class MinifyPlugin extends Plugin
         require_once('Minify/CSS.php');
         return Minify_CSS::minify($code,$options);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Minify',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:Minify',
+                            'rawdescription' =>
+                            _m('The Minify plugin minifies your CSS and Javascript, removing whitespace and comments.'));
+        return true;
+    }
 }
 

plugins/PubSubHubBub/PubSubHubBubPlugin.php

@@ -118,4 +118,16 @@ class PubSubHubBubPlugin extends Plugin
             }
         }
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'PubSubHubBub',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:PubSubHubBub',
+                            'rawdescription' =>
+                            _m('The PubSubHubBub plugin pushes RSS/Atom updates to a <a href="http://pubsubhubbub.googlecode.com/">PubSubHubBub</a> hub.'));
+
+        return true;
+    }
 }

plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php

@@ -96,5 +96,16 @@ class RequireValidatedEmailPlugin extends Plugin
         }
         return false;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Require Validated Email',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews, Evan Prodromou, Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:RequireValidatedEmail',
+                            'rawdescription' =>
+                            _m('The Require Validated Email plugin disables posting for accounts that do not have a validated email address.'));
+        return true;
+    }
 }
 

plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php

@@ -53,4 +53,15 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
         $registration_data['nickname'] = $username ;
         return User::register($registration_data);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Reverse Username Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:ReverseUsernameAuthentication',
+                            'rawdescription' =>
+                            _m('The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username.'));
+        return true;
+    }
 }

plugins/XCachePlugin.php

@@ -109,5 +109,16 @@ class XCachePlugin extends Plugin
         Event::handle('EndCacheDelete', array($key));
         return false;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'XCache',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:XCache',
+                            'rawdescription' =>
+                            _m('Use the <a href="http://xcache.lighttpd.net/">XCache</a> variable cache to cache query results.'));
+        return true;
+    }
 }