summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-20 06:56:59 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-20 06:56:59 -0400
commit97bc06d2ee29b42a3009a2bf4c57ebd71e63cf0e (patch)
treea52a68d366d3c908f7cc7837c2ee086bc3d4648b
parent3c56b10036e01c1165e04919b4df021c0bb1bace (diff)
gettext strings and pass the query string between tabs http://laconi.ca/PITS/00231
darcs-hash:20080720105659-533db-35a71fab668a7ea692f7b51557b4f84addb796bb.gz
-rw-r--r--lib/action.php6
-rw-r--r--lib/searchaction.php21
2 files changed, 16 insertions, 11 deletions
diff --git a/lib/action.php b/lib/action.php
index 1d3614ae1..8f72b542b 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -84,9 +84,9 @@ class Action { // lawsuit
$action = $this->trimmed('action');
common_element_start('ul', array('id' => 'nav_views'));
foreach ($menu as $menuaction => $menudesc) {
- common_menu_item(common_local_url($menuaction),
- _($menudesc[0]),
- _($menudesc[1]),
+ common_menu_item(common_local_url($menuaction, isset($menudesc[2]) ? $menudesc[2] : NULL),
+ $menudesc[0],
+ $menudesc[1],
$action == $menuaction);
}
common_element_end('ul');
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 46779bf7a..c0eab7d24 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -92,14 +92,19 @@ class SearchAction extends Action {
}
function search_menu() {
- # action => array('prompt', 'title')
- static $menu =
- array('peoplesearch' =>
- array('People',
- 'Find people on this site'),
- 'noticesearch' =>
- array('Text',
- 'Find content of notices'));
+ # action => array('prompt', 'title', $args)
+ $action = $this->trimmed('action');
+ $menu =
+ array('peoplesearch' =>
+ array(
+ _('People'),
+ _('Find people on this site'),
+ ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
+ 'noticesearch' =>
+ array( _('Text'),
+ _('Find content of notices'),
+ ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
+ );
$this->nav_menu($menu);
}
}