Update ApiOauthRequestTokenAction to support OAuth 1.0a

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 130b28ff52d7f5e57cce80ac0fd5ca45ff5ddfdb..14c3ed016d15aaeb0bcc4aff664676c20da080f9 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -117,14 +117,17 @@ 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);
+        $this->submit('search', _m('BUTTON','Search'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
@@ -135,6 +138,8 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
+        // @todo FIXME: 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.
 * Try different keywords.
@@ -145,6 +150,8 @@ 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.
+            // 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:
@@ -159,6 +166,7 @@ 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->raw(common_markup_to_html($message));
@@ -166,4 +174,3 @@ E_O_T
         $this->elementEnd('div');
     }
 }
-