From fbf2a58ac3beafea0a0e4031037b52e737bdd384 Mon Sep 17 00:00:00 2001 From: mikec Date: Mon, 21 Jul 2008 05:01:10 -0400 Subject: [PATCH] Get text wrappers around strings so they can be in the native language of the site and use fancy urls if appropriate darcs-hash:20080721090110-edabd-aea47e1cbcc2527fdb0274cb29638d2abc108a35.gz --- actions/opensearch.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/actions/opensearch.php b/actions/opensearch.php index 6811226a2f..0f366be4ca 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -25,33 +25,33 @@ class OpensearchAction extends Action { parent::handle($args); - $type = $this->trimmed('type'); - - $short_name = ''; - if ($type == 'people') { - $type = 'peoplesearch'; - $short_name = 'People Search'; - } else { - $short_name = 'Notice Search'; - $type = 'noticesearch'; - } + $type = $this->trimmed('type'); + + $short_name = ''; + if ($type == 'people') { + $type = 'peoplesearch'; + $short_name = _('People Search'); + } else { + $short_name = _('Notice Search'); + $type = 'noticesearch'; + } header('Content-Type: text/html'); common_start_xml(); common_element_start('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/')); - - $short_name = common_config('site', 'name').' '.$short_name; + + $short_name = common_config('site', 'name').' '.$short_name; common_element('ShortName', NULL, $short_name); common_element('Contact', NULL, common_config('site', 'email')); - common_element('Url', array('type' => 'text/html', 'method' => 'get', - 'template' => common_path('index.php?action='.$type.'&q={searchTerms}'))); - common_element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico')); - common_element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png')); - common_element('AdultContent', NULL, 'false'); - common_element('Language', NULL, common_language()); - common_element('OutputEncoding', NULL, 'UTF-8'); - common_element('InputEncoding', NULL, 'UTF-8'); + common_element('Url', array('type' => 'text/html', 'method' => 'get', + 'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---'))))); + common_element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico')); + common_element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png')); + common_element('AdultContent', NULL, 'false'); + common_element('Language', NULL, common_language()); + common_element('OutputEncoding', NULL, 'UTF-8'); + common_element('InputEncoding', NULL, 'UTF-8'); common_element_end('OpenSearchDescription'); common_end_xml();