GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

gettext strings and pass the query string between tabs http://laconi.ca/PITS/00231 

darcs-hash:20080720105659-533db-35a71fab668a7ea692f7b51557b4f84addb796bb.gz
This commit is contained in:
Mike Cochrane 2008-07-20 06:56:59 -04:00
parent 3c56b10036
commit 97bc06d2ee
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/action.php
View File

@ -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');

21
lib/searchaction.php
View File

@ -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);
}
}