Avoid CLI printing some PEAR::DB deprecated stuff

[quix0rs-gnu-social.git] / plugins / WikiHashtags / WikiHashtagsPlugin.php

diff --git a/plugins/WikiHashtags/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php
index c6c976b8f46849cd79150d1c8d19295857475aa0..f0baa597ce8489d923b4be8960efe42595a26cae 100644 (file)
--- a/plugins/WikiHashtags/WikiHashtagsPlugin.php
+++ b/plugins/WikiHashtags/WikiHashtagsPlugin.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET')) {
  *
  * @see      Event
  */
-
 class WikiHashtagsPlugin extends Plugin
 {
     const VERSION = '0.1';
@@ -52,17 +51,15 @@ class WikiHashtagsPlugin extends Plugin
         parent::__construct();
     }
 
-    function onStartShowSections($action)
+    function onStartShowSections(Action $action)
     {
         $name = $action->trimmed('action');
 
         if ($name == 'tag') {
-
             $taginput = $action->trimmed('tag');
             $tag = common_canonical_tag($taginput);
 
             if (!empty($tag)) {
-
                 $url = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=render',
                                urlencode($tag));
                 $editurl = sprintf('http://hashtags.wikia.com/index.php?title=%s&action=edit',
@@ -81,16 +78,23 @@ class WikiHashtagsPlugin extends Plugin
                     $action->raw($html);
                     $action->elementStart('p');
                     $action->element('a', array('href' => $editurl,
-                                                'title' => sprintf(_('Edit the article for #%s on WikiHashtags'), $tag)),
-                                     _('Edit'));
+                                                // TRANS: Link title for editing an article on WikiHashTags.
+                                                // TRANS: %s is the hash tag page to be edited.
+                                                'title' => sprintf(_m('Edit the article for #%s on WikiHashtags'), $tag)),
+                                     // TRANS: Link description for editing an article on WikiHashTags.
+                                     _m('Edit'));
                     $action->element('a', array('href' => 'http://www.gnu.org/copyleft/fdl.html',
-                                                'title' => _('Shared under the terms of the GNU Free Documentation License'),
+                                                // TRANS: Link title for viewing the GFDL.
+                                                'title' => _m('Shared under the terms of the GNU Free Documentation License'),
                                                 'rel' => 'license'),
-                                     'GNU FDL');
+                                     // TRANS: Link description for viewing the GFDL.
+                                     _m('GNU FDL'));
                     $action->elementEnd('p');
                 } else {
                     $action->element('a', array('href' => $editurl),
-                                     sprintf(_('Start the article for #%s on WikiHashtags'), $tag));
+                                     // TRANS: Link description for editing an article on WikiHashTags.
+                                     // TRANS: %s is the hash tag page to be created.
+                                     sprintf(_m('Start the article for #%s on WikiHashtags'), $tag));
                 }
 
                 $action->elementEnd('div');
@@ -107,6 +111,7 @@ class WikiHashtagsPlugin extends Plugin
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:WikiHashtags',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Gets hashtag descriptions from <a href="http://hashtags.wikia.com/">WikiHashtags</a>.'));
         return true;
     }