Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / PtitUrl / PtitUrlPlugin.php

diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php
index 25a463c0be08470c185e56b9e6d811c92f52251f..3a3e767e43df2f58805eb4124a8cdc8a0818a876 100644 (file)
--- a/plugins/PtitUrl/PtitUrlPlugin.php
+++ b/plugins/PtitUrl/PtitUrlPlugin.php
@@ -38,7 +38,8 @@ class PtitUrlPlugin extends UrlShortenerPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->serviceUrl)){
-            throw new Exception("must specify a serviceUrl");
+            // TRANS: Exception thrown when URL shortening plugin was configured incorrectly.
+            throw new Exception(_m('You must specify a serviceUrl for ptit URL shortening.'));
         }
     }
 
@@ -50,23 +51,24 @@ class PtitUrlPlugin extends UrlShortenerPlugin
         @$dom->loadHTML($response);
         $y = @simplexml_import_dom($dom);
         if (!isset($y->body)) return;
+        // @TODO Super-ugly style???
         $xml = $y->body->center->table->tr->td->pre->a->attributes();
         if (isset($xml['href'])) {
             return strval($xml['href']);
         }
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName),
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:PtitUrl',
                             'rawdescription' =>
+                            // TRANS: Plugin description. %1$s is the URL shortening service base URL (for example "bit.ly").
                             sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'),
                                     $this->shortenerName));
 
         return true;
     }
 }
-