From 45548395757db9c7c42a4a19c53b601bbf9b0dc4 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 17 Sep 2006 18:36:14 +0000
Subject: [PATCH] r1165: Forgot these strings in gettext switch

---
 admin/global.php                    |  8 ++++----
 admin/product.php                   | 10 +++++-----
 docs/changes.txt                    |  1 +
 includes/class_message_reporter.php |  2 +-
 includes/functions.php              |  6 +++---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/admin/global.php b/admin/global.php
index 4e8cb6e..c232b08 100755
--- 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 bbb8aa9..117d036 100755
--- 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 d663fce..e540251 100644
--- 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 2a2105a..8ddae4d 100755
--- 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 559b7a6..45a548f 100755
--- 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 &lt;%2$s&gt;'), $userinfo['displayname'], $userinfo['email']);
+			$username = sprintf(_('%1$s &lt;%2$s&gt;'), $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;
 		}
 		
-- 
2.22.5