X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsearchaction.php;h=450b04ba7a825140646f9e2a3a73eec9697761f4;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=7038424fab1733b2f73c21684fee4b4dda8f729b;hpb=31c1177970124cee31823cab3a11542c23b4126d;p=quix0rs-gnu-social.git

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 7038424fab..450b04ba7a 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -51,31 +51,17 @@ class SearchAction extends Action
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showPage();
     }
 
-    /**
-     * Show tabset for this page
-     *
-     * Uses the SearchGroupNav widget
-     *
-     * @return void
-     * @see SearchGroupNav
-     */
-    function showObjectNav()
-    {
-        $nav = new SearchGroupNav($this, $this->trimmed('q'));
-        $nav->show();
-    }
-
     function showTop($arr=null)
     {
         $error = null;
@@ -98,10 +84,6 @@ class SearchAction extends Action
         return null;
     }
 
-    function showNoticeForm() {
-        // remote post notice form
-    }
-
     function showContent() {
         $this->showTop();
         $this->showForm();
@@ -127,7 +109,7 @@ class SearchAction extends Action
         // TRANS: for searching can be entered.
         $this->input('q', _('Keyword(s)'), $q);
         // TRANS: Button text for searching site.
-        $this->submit('search', _m('BUTTON','Search'));
+        $this->element('input', array('type'=>'submit', 'class'=>'submit', 'value'=>_m('BUTTON','Search')));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
@@ -138,32 +120,27 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        // @todo FIXME: i18n issue: This formatting does not make this string get picked up by gettext.
-            // TRANS: Standard search suggestions shown when a search does not give any results.
-        $message = _(<<<E_O_T
-* Make sure all words are spelled correctly.
+        // Don't change these long strings to HEREDOC; xgettext won't pick them up.
+        // TRANS: Standard search suggestions shown when a search does not give any results.
+        $message = _("* Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
-* Try fewer keywords.
+* Try fewer keywords.");
+            $message .= "\n";
 
-E_O_T
-);
         if (!common_config('site', 'private')) {
             $qe = urlencode($q);
-            // @todo FIXME: i18n issue: This formatting does not make this string get picked up by gettext.
+            $message .= "\n";
+            // Don't change these long strings to HEREDOC; xgettext won't pick them up.
             // TRANS: Standard search suggestions shown when a search does not give any results.
-            $message .= sprintf(_(<<<E_O_T
-
-You can also try your search on other engines:
-
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
-* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
-* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
-* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
-* [Collecta](http://collecta.com/#q=%s)
+            $message .= sprintf(_("You can also try your search on other engines:
 
-E_O_T
-), $qe, $qe, $qe, $qe, $qe);
+* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)
+* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)
+* [Google](https://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
+* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
+"), $qe, $qe, $qe, $qe);
+            $message .= "\n";
         }
         $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));