More _t( to _( and sprintfs in new code

darcs-hash:20080710051035-533db-4a3d824a50545b8a291a81059dcbb97487a13630.gz

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 0a9f4c37fe9ae423ca13a99e57a336124fec6f82..d4de61a904653ee0b842f2875781c2c9163862d1 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -27,12 +27,12 @@ define(NOTICES_PER_PAGE, 20);
 class NoticesearchAction extends SearchAction {
        
        function get_instructions() {
-               return _t('Search for notices on %%site.name%% by their contents. ' . 
+               return _('Search for notices on %%site.name%% by their contents. ' .
                                  'Separate search terms by spaces; they must be 3 characters or more.');
        }
        
        function get_title() {
-               return _t('Text search');
+               return _('Text search');
        }
        
        function show_results($q, $page) {
@@ -62,7 +62,7 @@ class NoticesearchAction extends SearchAction {
                        }
                        common_element_end('ul');
                } else {
-                       common_element('p', 'error', _t('No results'));
+                       common_element('p', 'error', _('No results'));
                }
                
                common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
@@ -78,7 +78,7 @@ class NoticesearchAction extends SearchAction {
                                                                                 'href' => common_local_url('noticesearchrss',
                                                                                                                                        array('q' => $q)),
                                                                                 'type' => 'application/rss+xml',
-                                                                                'title' => _t('Search Stream Feed')));
+                                                                                'title' => _('Search Stream Feed')));
                }
        }
        
@@ -124,14 +124,14 @@ class NoticesearchAction extends SearchAction {
                        common_text(' (');
                        common_element('a', array('class' => 'inreplyto',
                                                                          'href' => $replyurl),
-                                                  _t('in reply to...'));
+                                                  _('in reply to...'));
                        common_text(')');
                }
                common_element_start('a', 
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),
                                                                   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-                                                                  'title' => _t('reply'),
+                                                                  'title' => _('reply'),
                                                                   'class' => 'replybutton'));
                common_raw('→');
                common_element_end('a');

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index 6df146ed518706b7ebb7642a18d8cb2a9e86ee8a..482fe6db9f85995ceaad7bb5347a23c9708a09dd 100644 (file)
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -61,9 +61,9 @@ class NoticesearchrssAction extends Rss10Action {
                global $config;
                $q = $this->trimmed('q');
                $c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
-                                  'title' => $config['site']['name'] . _t(' Search Stream for "' . $q . '"'),
+                                  'title' => $config['site']['name'] . sprintf(_(' Search Stream for "%s"'), $q),
                                   'link' => common_local_url('noticesearch', array('q' => $q)),
-                                  'description' => _t('All updates matching search term "') . $q . '"');
+                                  'description' => sprintf(_('All updates matching search term "%s"'), $q));
                return $c;
        }
        

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 644f0a7f7f8c14a153d6dbfda8a45781bc4d2fb4..308832429a63d4e35bfe7428e0f3ffe40700e419 100644 (file)
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -25,12 +25,12 @@ define(PROFILES_PER_PAGE, 10);
 class PeoplesearchAction extends SearchAction {
        
        function get_instructions() {
-               return _t('Search for people on %%site.name%% by their name, location, or interests. ' . 
+               return _('Search for people on %%site.name%% by their name, location, or interests. ' .
                                  'Separate the terms by spaces; they must be 3 characters or more.');
        }
 
        function get_title() {
-               return _t('People search');
+               return _('People search');
        }
        
        function show_results($q, $page) {
@@ -61,7 +61,7 @@ class PeoplesearchAction extends SearchAction {
                        }
                        common_element_end('ul');
                } else {
-                       common_element('p', 'error', _t('No results'));
+                       common_element('p', 'error', _('No results'));
                }
                
                common_pagination($page > 1, $cnt > PROFILES_PER_PAGE,

diff --git a/lib/action.php b/lib/action.php
index b36312e40925103afabad62ef7db1a62877f6613..d4b6743d0697d4f2a4965f6f9733860d42a9b9ee 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -81,8 +81,8 @@ class Action { // lawsuit
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
             common_menu_item(common_local_url($menuaction),
-                                                        _t($menudesc[0]),
-                                                        _t($menudesc[1]),
+                                                        _($menudesc[0]),
+                                                        _($menudesc[1]),
                                                         $action == $menuaction);
         }
         common_element_end('ul');