Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / lib / searchaction.php

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 0d9f85a8f18a5f623628bfec448b68002ce9390e..cc8966eeaed91800b83f2122e69532709e690a92 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -62,21 +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;
@@ -117,14 +102,18 @@ class SearchAction extends Action
                                            'class' => 'form_settings',
                                            'action' => common_local_url($this->trimmed('action'))));
         $this->elementStart('fieldset');
+        // TRANS: Fieldset legend for the search form.
         $this->element('legend', null, _('Search site'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         if (!common_config('site', 'fancy')) {
             $this->hidden('action', $this->trimmed('action'));
         }
-        $this->input('q', 'Keyword(s)', $q);
-        $this->submit('search', 'Search');
+        // TRANS: Used as a field label for the field where one or more keywords
+        // 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->elementEnd('li');
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
@@ -135,29 +124,30 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        $qe = urlencode($q);
-        $message = sprintf(_(<<<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";
 
-You can also try your search on other engines:
+        if (!common_config('site', 'private')) {
+            $qe = urlencode($q);
+            $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(_("You can also try your search on other engines:
 
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
+* [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);
-        $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
-        $this->element('dt', null, _('Search help'));
-        $this->elementStart('dd', 'instructions');
+* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe);
+            $message .= "\n";
+        }
+        $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));
-        $this->elementEnd('dd');
         $this->elementEnd('div');
     }
 }
-