r1165: Forgot these strings in gettext switch

diff --git a/admin/global.php b/admin/global.php
index 4e8cb6eaf0c236f010e3fb14900756f0d391f407..c232b08f07869709fcf638067e4e162ee4fda8f3 100755 (executable)
--- a/admin/global.php
+++ b/admin/global.php
@@ -57,10 +57,10 @@ function admin_login()
        
        $admin->form_start('../login.php', 'cplogin', false, 'cplogin');
        $admin->table_start(true, '425');
-       $admin->table_head($bugsys->lang->string('Login to Bugdar'));
-       $admin->row_input($bugsys->lang->string('Email'), 'email', $bugsys->userinfo['email'], 2, 35, false, false, 'middle');
-       $admin->row_input($bugsys->lang->string('Password'), 'password', '', 2, 35, false, true, 'middle');
-       $admin->row_submit('', $bugsys->lang->string('Login'));
+       $admin->table_head(_('Login to Bugdar'));
+       $admin->row_input(_('Email'), 'email', $bugsys->userinfo['email'], 2, 35, false, false, 'middle');
+       $admin->row_input(_('Password'), 'password', '', 2, 35, false, true, 'middle');
+       $admin->row_submit('', _('Login'));
        $admin->table_end();
        $admin->form_end();
        

diff --git a/admin/product.php b/admin/product.php
index bbb8aa9c9af7712d86471f5f02b4eb1f1657d52d..117d036ce5c019a6c1233a525544a0dd68381216 100755 (executable)
--- a/admin/product.php
+++ b/admin/product.php
@@ -43,22 +43,22 @@ function construct_option_list($type, $id, $edit, $addcomponent, $addversion, $d
        
        if ($edit)
        {
-               $opt .= '<option value="product.php?do=edit' . $type . '&' . $type_action . '=' . $id . '">' . sprintf($bugsys->lang->string('Edit %1$s'), $type_display) . '</option>';
+               $opt .= '<option value="product.php?do=edit' . $type . '&' . $type_action . '=' . $id . '">' . sprintf(_('Edit %1$s'), $type_display) . '</option>';
        }
        
        if ($delete)
        {
-               $opt .= '<option value="product.php?do=delete' . $type . '&' . $type_action . '=' . $id . '">' . sprintf($bugsys->lang->string('Delete %1$s'), $type_display) . '</option>';
+               $opt .= '<option value="product.php?do=delete' . $type . '&' . $type_action . '=' . $id . '">' . sprintf(_('Delete %1$s'), $type_display) . '</option>';
        }
        
        if ($addcomponent)
        {
-               $opt .= '<option value="product.php?do=addproduct&productid=' . $id . '">' . $bugsys->lang->string('Add Component') . '</option>';
+               $opt .= '<option value="product.php?do=addproduct&productid=' . $id . '">' . _('Add Component') . '</option>';
        }
        
        if ($addversion)
        {
-               $opt .= '<option value="product.php?do=addversion&productid=' . $id . '">' . $bugsys->lang->string('Add Version') . '</option>';
+               $opt .= '<option value="product.php?do=addversion&productid=' . $id . '">' . _('Add Version') . '</option>';
        }
        
        $type = strtolower($type);
@@ -67,7 +67,7 @@ function construct_option_list($type, $id, $edit, $addcomponent, $addversion, $d
        
        $displayorder = (($displayorder != -1) ? '<input type="text" name="displayorder[' . $name . ']" value="' . $displayorder . '" size="4" class="input" /> ' : '');
        
-       return $displayorder . '<select id="' . $name . '" name="' . $name . '" onchange="exec_action(\'' . $name . '\')" class="input">' . $opt . '</select> <input type="button" class="button" name="gobutton" value="  ' . $bugsys->lang->string('Go') . '  " onclick="exec_action(\'' . $name . '\')" />';
+       return $displayorder . '<select id="' . $name . '" name="' . $name . '" onchange="exec_action(\'' . $name . '\')" class="input">' . $opt . '</select> <input type="button" class="button" name="gobutton" value="  ' . _('Go') . '  " onclick="exec_action(\'' . $name . '\')" />';
 }
 
 // ###################################################################

diff --git a/docs/changes.txt b/docs/changes.txt
index d663fce2a734787529f0d958f16c4acd527a1307..e540251aa396a3675fb83a7f369b59698ba0205c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -9,6 +9,7 @@
 - Add checks to newreport.php and search.php to see if there are products or versions, if there aren't, then throw a message about needing them to be setup
 - Process custom field data on newreport.php
 - Add regex matching check to process_custom_fields()
+- Missed some string conversions to gettext
 
 1.1.0 Beta 2
 ===============================

diff --git a/includes/class_message_reporter.php b/includes/class_message_reporter.php
index 2a2105a8ca7b3be2542d257ae5e3dff2719b7912..8ddae4d6b4f7c7705c6a612f2f14d7eb8986c4d3 100755 (executable)
--- a/includes/class_message_reporter.php
+++ b/includes/class_message_reporter.php
@@ -106,7 +106,7 @@ class Message_Reporter
        {
                global $bugsys;
                
-               $this->error($bugsys->lang->string('You do not have permission to access this page. If you think that this is an error, please contact an administrator.'));
+               $this->error(_('You do not have permission to access this page. If you think that this is an error, please contact an administrator.'));
        }
        
        /**

diff --git a/includes/functions.php b/includes/functions.php
index 559b7a6fffad5ec96ce14233d6b8f2e1766a4ba1..45a548fe164d72fc66de38fef521c6e7486b2d69 100755 (executable)
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -67,7 +67,7 @@ function construct_user_display($userinfo, $html = true)
        
        if (!$userinfo['userid'])
        {
-               $userinfo['displayname'] = $bugsys->lang->string('Guest');
+               $userinfo['displayname'] = _('Guest');
                $userinfo['showemail'] = false;
        }
        
@@ -79,7 +79,7 @@ function construct_user_display($userinfo, $html = true)
        {
                if ($userinfo['showemail'])
                {
-                       $username = sprintf($bugsys->lang->string('%1$s <%2$s>'), $userinfo['displayname'], $userinfo['email']);
+                       $username = sprintf(_('%1$s <%2$s>'), $userinfo['displayname'], $userinfo['email']);
                }
                else
                {
@@ -378,7 +378,7 @@ function process_custom_fields($bugid, $msg, $errorbox = false, $inputdata = arr
                                
                if ($field['required'] AND empty($inputdata["field$field[fieldid]"]))
                {
-                       $errorlist[] = sprintf($bugsys->lang->string('The "%1$s" field is a required field.'), $field['name']);
+                       $errorlist[] = sprintf(_('The "%1$s" field is a required field.'), $field['name']);
                        continue;
                }