Extended profile - fix some issues saving and displaying dates

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 14c3ed016d15aaeb0bcc4aff664676c20da080f9..7038424fab1733b2f73c21684fee4b4dda8f729b 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();
@@ -127,6 +126,7 @@ class SearchAction extends 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);
+        // TRANS: Button text for searching site.
         $this->submit('search', _m('BUTTON','Search'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
@@ -138,7 +138,7 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        // @todo FIXME: This formatting does not make this string get picked up by gettext.
+        // @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.
@@ -150,7 +150,7 @@ E_O_T
 );
         if (!common_config('site', 'private')) {
             $qe = urlencode($q);
-            // @todo FIXME: This formatting does not make this string get picked up by gettext.
+            // @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 .= sprintf(_(<<<E_O_T
 
@@ -165,12 +165,8 @@ You can also try your search on other engines:
 E_O_T
 ), $qe, $qe, $qe, $qe, $qe);
         }
-        $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');
     }
 }