Merge branch 'inblob' of git@gitorious.org:~evan/statusnet/evans-mainline into inblob

[quix0rs-gnu-social.git] / plugins / TwitterBridge / TwitterBridgePlugin.php

diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index ad3c2e551cb0291490b233f5412f9c7a5982d4c0..a87ee2894a77c443e0b9496f26270d963d7be188 100644 (file)
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -31,6 +31,8 @@ if (!defined('STATUSNET')) {
 
 require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
 
+define('TWITTERBRIDGEPLUGIN_VERSION', '0.9');
+
 /**
  * Plugin for sending and importing Twitter statuses
  *
@@ -86,8 +88,8 @@ class TwitterBridgePlugin extends Plugin
         $action_name = $action->trimmed('action');
 
         $action->menuItem(common_local_url('twittersettings'),
-                          _('Twitter'),
-                          _('Twitter integration options'),
+                          _m('Twitter'),
+                          _m('Twitter integration options'),
                           $action_name === 'twittersettings');
 
         return true;
@@ -127,7 +129,12 @@ class TwitterBridgePlugin extends Plugin
      */
     function onStartEnqueueNotice($notice, &$transports)
     {
-        array_push($transports, 'twitter');
+        // Avoid a possible loop
+
+        if ($notice->source != 'twitter') {
+            array_push($transports, 'twitter');
+        }
+
         return true;
     }
 
@@ -184,4 +191,17 @@ class TwitterBridgePlugin extends Plugin
         return true;
     }
 
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'TwitterBridge',
+                            'version' => TWITTERBRIDGEPLUGIN_VERSION,
+                            'author' => 'Zach Copley',
+                            'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge',
+                            'rawdescription' =>
+                            _m('The Twitter "bridge" plugin allows you to integrate ' .
+                               'your StatusNet instance with ' .
+                               '<a href="http://twitter.com/">Twitter</a>.'));
+        return true;
+    }
+
 }