X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsearchaction.php;h=cc8966eeaed91800b83f2122e69532709e690a92;hb=03791eca892a50c7bbb3cc922050dd46c4ed7390;hp=6d7f46cd6ee0131b4fcb1cba2fccb25332233b7c;hpb=04ca706601a2a3b556cc52fa21b61fcd842c4e87;p=quix0rs-gnu-social.git

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 6d7f46cd6e..cc8966eeae 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -62,20 +62,6 @@ class SearchAction extends Action
         $this->showPage();
     }
 
-    /**
-     * Show tabset for this page
-     *
-     * Uses the SearchGroupNav widget
-     *
-     * @return void
-     * @see SearchGroupNav
-     */
-    function showLocalNav()
-    {
-        $nav = new SearchGroupNav($this, $this->trimmed('q'));
-        $nav->show();
-    }
-
     function showTop($arr=null)
     {
         $error = null;
@@ -138,39 +124,30 @@ 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:
+            $message .= sprintf(_("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)
-
-E_O_T
-), $qe, $qe, $qe, $qe, $qe);
+* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe);
+            $message .= "\n";
         }
-        $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
-        // TRANS: Definition list item with instructions on how to get (better) search results.
-        $this->element('dt', null, _('Search help'));
-        $this->elementStart('dd', 'instructions');
+        $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));
-        $this->elementEnd('dd');
         $this->elementEnd('div');
     }
 }