better output for registration confirmation

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index bb71a2ba15c40f1e05ef0981335f12ef09ef7516..030d2bb724b2283b82228fd588b993aad65b1871 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -70,8 +70,7 @@ class SearchAction extends Action
      * @return void
      * @see SearchGroupNav
      */
-
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new SearchGroupNav($this, $this->trimmed('q'));
         $nav->show();
@@ -117,14 +116,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'));
         }
+        // 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);
-        $this->submit('search', _('Search'));
+        // TRANS: Button text for searching site.
+        $this->submit('search', _m('BUTTON','Search'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
@@ -135,18 +138,18 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        $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.
-
-E_O_T
-);
+");
         if (!common_config('site', 'private')) {
             $qe = urlencode($q);
-            $message .= sprintf(_(<<<E_O_T
-
+            // 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=%%%%site.server%%%%)
@@ -154,16 +157,10 @@ You can also try your search on other engines:
 * [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);
+"), $qe, $qe, $qe, $qe, $qe);
         }
-        $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
-        $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');
     }
 }
-