[phpBT-dev] CVS: phpbt index.php,1.39.2.1,1.39.2.2

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1:/tmp/cvs-serv15463

Modified Files:
      Tag: htmltemplates
	index.php 
Log Message:
gettext conversion

Index: index.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/index.php,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -r1.39.2.1 -r1.39.2.2
--- index.php	30 Aug 2003 22:07:12 -0000	1.39.2.1
+++ index.php	5 Sep 2003 11:59:17 -0000	1.39.2.2
@@ -2,7 +2,7 @@
 
 // index.php - Front page
 // ------------------------------------------------------------------------
-// Copyright (c) 2001, 2002 The phpBugTracker Group
+// Copyright (c) 2001 - 2003 The phpBugTracker Group
 // ------------------------------------------------------------------------
 // This file is part of phpBugTracker
 //
@@ -34,8 +34,7 @@
 	}
 
 	// Grab the data
-	$rs = $db->query("select status_id, count(status_id) as count from ".TBL_BUG.
-		" where project_id not in ($restricted_projects) group by status_id");
+	$rs = $db->query("select status_id, count(status_id) as count from ".TBL_BUG." where project_id not in ($restricted_projects) group by status_id");
 	while ($rs->fetchInto($row)) {
 		$stats[$row['status_id']]['count'] = $row['count'];
 	}
@@ -44,7 +43,6 @@
 }
 
 function build_image($restricted_projects) {
-	global $STRING;
 
 	error_reporting(0); // Force this, just in case
 	include_once JPGRAPH_PATH.'jpgraph.php';
@@ -63,7 +61,7 @@
 	}
 
 	if (!$totalbugs) {
-		return $STRING['nobugs'];
+		return translate("No bugs found");
 	}
 
 	// Create the Pie Graph.
@@ -71,8 +69,7 @@
 	$graph->SetShadow();
 
 	// Set A title for the plot
-	$graph->title->Set(sprintf("Bug Summary (%d bug%s)",
-		$totalbugs, $totalbugs == 1 ? '' : 's'));
+	$graph->title->Set(translate("Bug Summary"));
 	$graph->title->SetFont(FF_FONT1,FS_BOLD);
 
 	$graph->legend->Pos(0.03, 0.5, 'right', 'center');
@@ -93,7 +90,7 @@
 
 if (SHOW_PROJECT_SUMMARIES) {
 	$querystring = $QUERY['index-projsummary-1'];
-	$resfields = array('Project','Open');
+	$resfields = array(translate("Project"), translate("Open"));
 
 	// Grab the resolutions from the database
 	$rs = $db->query($QUERY['index-projsummary-2'].
@@ -105,7 +102,7 @@
 		$resfields[] = $fieldname;
 		$querystring .= $countquery;
 	}
-	$resfields[] = 'Total';
+	$resfields[] = translate("Total");
 
 	$db->setOption('optimize', 'performance'); // For Oracle to do this loop
 	$aProjects = array(
@@ -132,13 +129,14 @@
 	$sOpenStatusQuery = '&status%5B%5D='.@join('&status%5B%5D=', array(BUG_UNCONFIRMED, BUG_PROMOTED,
 	BUG_ASSIGNED, BUG_REOPENED));
 	
+	// QUESTION: Will this still work with using translate('Project')?
 	foreach ($aProjects['projects'] as $iProjectNumberKey => $value1) {
 		foreach ($aProjects['projects'][$iProjectNumberKey] as $sResolutionKey => $value2) {
-			if ($sResolutionKey != "Project" && $sResolutionKey != "Total" && $sResolutionKey != "Open") {
+			if ($sResolutionKey != translate("Project") && $sResolutionKey != translate("Total") && $sResolutionKey != translate("Open")) {
 				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?resolution%5B%5D=" . $aResolutionsToIds[$sResolutionKey] . "&projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
-			} elseif ($sResolutionKey == "Open") {
+			} elseif ($sResolutionKey == translate("Open")) {
 				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . $sOpenStatusQuery . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
-			} elseif ($sResolutionKey == "Total") {
+			} elseif ($sResolutionKey == translate("Total")) {
 				$aProjects['projects'][$iProjectNumberKey][$sResolutionKey] = "<A HREF='query.php?projects=" . $aProjectsToIds[$aProjects['projects'][$iProjectNumberKey]["Project"]] . "&op=doquery'>" . $aProjects['projects'][$iProjectNumberKey][$sResolutionKey] . "</A>";
 			}
 		}
@@ -153,16 +151,10 @@
 
 // Show the recently added and closed bugs
 $t->assign('recentbugs',
-	$db->getAll($db->modifyLimitQuery("select bug_id, title, project_name from ".TBL_BUG.
-		' b, '.TBL_PROJECT." p where b.project_id not in ($restricted_projects)".
-		' and b.project_id = p.project_id order by b.created_date desc', 0, 5)));
+	$db->getAll($db->modifyLimitQuery("select bug_id, title, project_name from ".TBL_BUG.' b, '.TBL_PROJECT." p where b.project_id not in ($restricted_projects) and b.project_id = p.project_id order by b.created_date desc", 0, 5)));
 
 $t->assign('closedbugs',
-	$db->getAll($db->modifyLimitQuery('select b.bug_id, title, project_name from '.TBL_BUG.' b, '.
-		TBL_PROJECT.' p'.
-		" where b.project_id not in ($restricted_projects)".
-		' and '.in_closed('status_id').
-		' and b.project_id = p.project_id order by close_date desc', 0, 5)));
+	$db->getAll($db->modifyLimitQuery('select b.bug_id, title, project_name from '.TBL_BUG.' b, '.TBL_PROJECT." p where b.project_id not in ($restricted_projects) and ".in_closed('status_id').' and b.project_id = p.project_id order by close_date desc', 0, 5)));
 
 if ($u != 'nobody') {
 	$pref = $db->GetOne('select saved_queries from '.TBL_USER_PREF." where user_id='".$u."'");
@@ -174,6 +166,6 @@
 }
 
 $t->assign('restricted_projects', $restricted_projects);
-$t->render('index.html', translate('Home'));
+$t->render('index.html', translate("Home"));
 
 ?>