gforge-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gforge-commits] gforge/www/reporting index.php, 1.3, 1.4 projectact.php


From: kikov
Subject: [Gforge-commits] gforge/www/reporting index.php, 1.3, 1.4 projectact.php, 1.1, 1.2 projectact_graph.php, 1.1, 1.2 projecttime.php, 1.1, 1.2 projecttime_graph.php, 1.1, 1.2 rebuild.php, 1.1, 1.2 siteact.php, 1.1, 1.2 siteact_graph.php, 1.1, 1.2 sitetime.php, 1.1, 1.2 sitetime_graph.php, 1.1, 1.2 sitetimebar.php, 1.1, 1.2 sitetimebar_graph.php, 1.1, 1.2 timeadd.php, 1.1, 1.2 timecategory.php, 1.1, 1.2 toolspie.php, 1.1, 1.2 toolspie_graph.php, 1.1, 1.2 trackerpie_graph.php, 1.1, 1.2 useract.php, 1.1, 1.2 useract_graph.php, 1.1, 1.2 useradded.php, 1.1, 1.2 useradded_graph.php, 1.1, 1.2 usercum.php, 1.1, 1.2 usercum_graph.php, 1.1, 1.2 usersummary.php, 1.1, 1.2 usertime.php, 1.1, 1.2 usertime_graph.php, 1.1, 1.2
Date: Wed, 04 Aug 2004 11:50:48 -0500

Update of /cvsroot/gforge/gforge/www/reporting
In directory db.perdue.net:/tmp/cvs-serv10536/www/reporting

Modified Files:
        index.php projectact.php projectact_graph.php projecttime.php 
        projecttime_graph.php rebuild.php siteact.php 
        siteact_graph.php sitetime.php sitetime_graph.php 
        sitetimebar.php sitetimebar_graph.php timeadd.php 
        timecategory.php toolspie.php toolspie_graph.php 
        trackerpie_graph.php useract.php useract_graph.php 
        useradded.php useradded_graph.php usercum.php 
        usercum_graph.php usersummary.php usertime.php 
        usertime_graph.php 
Log Message:
Patch [#861]. Reporting I18N. Phase1
report_utils, and all files but _graph updated
for _graph files it only changes $reporting_system_name to $sys_name


Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php   4 Aug 2004 02:33:34 -0000       1.3
+++ index.php   4 Aug 2004 16:50:45 -0000       1.4
@@ -54,10 +54,10 @@
 <p>
 <h3><?php echo $Language->getText('reporting','time_tracking'); ?></h3>
 <p>
-<a href="usertime.php"><?php echo 
$Language->getText('reporting','time_tracking_usertime'); ?></a> <a 
href="usertime.php?typ=r">(report)</a><br />
-<a href="projecttime.php"><?php echo 
$Language->getText('reporting','time_tracking_projecttime'); ?></a> <a 
href="projecttime.php?typ=r">(report)</a><br />
-<a href="sitetime.php"><?php echo 
$Language->getText('reporting','time_tracking_sitetime'); ?></a> <a 
href="sitetime.php?typ=r">(report)</a><br />
-<a href="sitetimebar.php"><?php echo 
$Language->getText('reporting','time_tracking_sitetimebar'); ?></a> <a 
href="sitetimebar.php?typ=r">(report)</a><br />
+<a href="usertime.php"><?php echo 
$Language->getText('reporting','time_tracking_usertime'); ?></a> <a 
href="usertime.php?typ=r">(<?php echo $Language->getText('reporting','report'); 
?>)</a><br />
+<a href="projecttime.php"><?php echo 
$Language->getText('reporting','time_tracking_projecttime'); ?></a> <a 
href="projecttime.php?typ=r">(<?php echo 
$Language->getText('reporting','report'); ?>)</a><br />
+<a href="sitetime.php"><?php echo 
$Language->getText('reporting','time_tracking_sitetime'); ?></a> <a 
href="sitetime.php?typ=r">(<?php echo $Language->getText('reporting','report'); 
?>)</a><br />
+<a href="sitetimebar.php"><?php echo 
$Language->getText('reporting','time_tracking_sitetimebar'); ?></a> <a 
href="sitetimebar.php?typ=r">(<?php echo 
$Language->getText('reporting','report'); ?>)</a><br />
 <a href="usersummary.php"><?php echo 
$Language->getText('reporting','time_tracking_usersummary'); ?></a><br />
 <p>
 <h3><?php echo $Language->getText('reporting','administrative'); ?></h3>

Index: projectact.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/projectact.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- projectact.php      28 Jul 2004 17:31:16 -0000      1.1
+++ projectact.php      4 Aug 2004 16:50:45 -0000       1.2
@@ -31,6 +31,8 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -42,20 +44,20 @@
 }
 
 
-echo report_header('Project Activity');
+echo report_header($Language->getText('reporting','project_activity_title'));
 
 ?>
-<h3>Project Activity</h3>
+<h3><?php echo $Language->getText('reporting','project_activity_title'); 
?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <input type="hidden" name="sw" value="<?php echo $sw; ?>">
 <table><tr>
-<td><strong>Project:</strong><br /><?php echo report_group_box('g_id',$g_id); 
?></td>
-<td><strong>Area:</strong><br /><?php echo report_area_box('area',$area); 
?></td>
-<td><strong>Type:</strong><br /><?php echo report_span_box('SPAN',$SPAN); 
?></td>
-<td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-<td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><strong><?php echo $Language->getText('reporting','project'); 
?>:</strong><br /><?php echo report_group_box('g_id',$g_id); ?></td>
+<td><strong><?php echo $Language->getText('reporting','area'); ?>:</strong><br 
/><?php echo report_area_box('area',$area); ?></td>
+<td><strong><?php echo $Language->getText('reporting','type'); ?>:</strong><br 
/><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+<td><strong><?php echo $Language->getText('reporting','end'); ?>:</strong><br 
/><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>

Index: projectact_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/projectact_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- projectact_graph.php        28 Jul 2004 17:31:16 -0000      1.1
+++ projectact_graph.php        4 Aug 2004 16:50:45 -0000       1.2
@@ -142,7 +142,7 @@
 //
 $graph->title->Set("Project Activity For: ".$g->getPublicName(). 
        " (".date('m/d/Y',$report->getStartDate()) ."-". 
date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Index: projecttime.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/projecttime.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- projecttime.php     28 Jul 2004 17:31:16 -0000      1.1
+++ projecttime.php     4 Aug 2004 16:50:45 -0000       1.2
@@ -31,6 +31,8 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -41,12 +43,12 @@
        $start = $z[count($z)-1];
 }
 
-echo report_header('Time Tracking By Project');
+echo report_header($Language->getText('reporting_ttbp','title'));
 
-$a[]='By Task';
-$a[]='By Category';
-$a[]='By Subproject';
-$a[]='By User';
+$a[]=$Language->getText('reporting_ttbp','bytask');
+$a[]=$Language->getText('reporting_ttbp','bycategory');
+$a[]=$Language->getText('reporting_ttbp','bysubproject');
+$a[]=$Language->getText('reporting_ttbp','byuser');
 
 $a2[]='tasks';
 $a2[]='category';
@@ -54,17 +56,17 @@
 $a2[]='user';
 
 ?>
-<h3>Time Tracking By Project</h3>
+<h3><?php echo $Language->getText('reporting_ttbp','title'); ?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <input type="hidden" name="sw" value="<?php echo $sw; ?>">
 <input type="hidden" name="typ" value="<?php echo $typ; ?>">
 <table><tr>
-<td><strong>Project:</strong><br /><?php echo report_group_box('g_id',$g_id); 
?></td>
-<td><strong>Type:</strong><br /><?php echo 
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
-<td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-<td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><strong><?php echo $Language->getText('reporting','project'); 
?>:</strong><br /><?php echo report_group_box('g_id',$g_id); ?></td>
+<td><strong><?php echo $Language->getText('reporting','type'); ?>:</strong><br 
/><?php echo html_build_select_box_from_arrays($a2,$a,'type',$type,false); 
?></td>
+<td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+<td><strong><?php echo $Language->getText('reporting','end'); ?>:</strong><br 
/><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>
@@ -75,7 +77,8 @@
                $labels = $report->labels;
            $data = $report->getData();
 
-           echo $HTML->listTableTop (array('Type','Time'));
+           echo $HTML->listTableTop 
(array($Language->getText('reporting','type'),
+                       $Language->getText('reporting','time')));
 
            for ($i=0; $i<count($labels); $i++) {
 

Index: projecttime_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/projecttime_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- projecttime_graph.php       28 Jul 2004 17:31:16 -0000      1.1
+++ projecttime_graph.php       4 Aug 2004 16:50:45 -0000       1.2
@@ -70,7 +70,7 @@
 $arr['user']='By User';
 
 $graph->title->Set("Time Report ".$arr[$type]." (".date('m/d/Y',$start) ."-". 
date('m/d/Y',$end) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 
 report_pie_arr($report->labels,$report->getData());
 

Index: rebuild.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/rebuild.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rebuild.php 28 Jul 2004 17:31:16 -0000      1.1
+++ rebuild.php 4 Aug 2004 16:50:45 -0000       1.2
@@ -32,7 +32,9 @@
 
 session_require( array('group'=>$sys_stats_group,'A') );
 
-echo report_header('Main Page');
+global $Language;
+
+echo report_header($Language->getText('reporting_rebuild','title'));
 
 if ($submit && $im_sure) {
 
@@ -45,22 +47,12 @@
        }
 
 }
-
+       echo $Language->getText('reporting_rebuild','message');
 ?>
-<h3>Reporting System Initialization</h3>
-<p>
-Occasionally, if cronjobs failed or the database was damaged, 
-you may have to rebuild the reporting tables.
-<p>
-If you are sure you want to rebuild all the reporting tables, 
-check the "I'm Sure" box and click the button below.
-<p>
-This could take a couple minutes, so DO NOT CLICK MORE THAN ONCE.
-<p>
 <form action="<?php echo $PHP_SELF; ?>" method="post">
-<input type="checkbox" name="im_sure" value="1">I'm Sure<p>
+<input type="checkbox" name="im_sure" value="1"><?php echo 
$Language->getText('reporting_rebuild','imsure'); ?><p>
 <p>
-<input type="submit" name="submit" value="Press ONLY ONCE">
+<input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting_rebuild','pressonlyonce'); ?>">
 </form>
 
 <?php

Index: siteact.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/siteact.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- siteact.php 28 Jul 2004 17:31:16 -0000      1.1
+++ siteact.php 4 Aug 2004 16:50:45 -0000       1.2
@@ -30,6 +30,7 @@
 require_once('common/reporting/Report.class');
 
 session_require( array('group'=>$sys_stats_group) );
+global $Language;
 
 $report=new Report();
 if ($report->isError()) {
@@ -42,10 +43,10 @@
 }
 
 
-echo report_header('Site-Wide Activity');
+echo report_header($Language->getText('reporting','site_wide_activity'));
 
 ?>
-<h3>Site-Wide Activity</h3>
+<h3><?php echo $Language->getText('reporting','site_wide_activity'); ?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <table><tr>
@@ -53,7 +54,7 @@
 <td><strong>Type:</strong><br /><?php echo report_span_box('SPAN',$SPAN); 
?></td>
 <td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
 <td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>

Index: siteact_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/siteact_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- siteact_graph.php   28 Jul 2004 17:31:16 -0000      1.1
+++ siteact_graph.php   4 Aug 2004 16:50:45 -0000       1.2
@@ -129,7 +129,7 @@
 //     Titles
 //
 $graph->title->Set("Site-Wide Activity 
(".date('m/d/Y',$report->getStartDate()) ."-". 
date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Index: sitetime.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/sitetime.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sitetime.php        28 Jul 2004 17:31:16 -0000      1.1
+++ sitetime.php        4 Aug 2004 16:50:45 -0000       1.2
@@ -30,6 +30,7 @@
 require_once('common/reporting/ReportSiteTime.class');
 
 session_require( array('group'=>$sys_stats_group) );
+global $Language;
 
 $report=new Report();
 if ($report->isError()) {
@@ -41,12 +42,12 @@
        $start = $z[count($z)-1];
 }
 
-echo report_header('Site-Wide Time Tracking');
+echo report_header($Language->getText('reporting','site_wide_time_tracking'));
 
-$a[]='By Task';
-$a[]='By Category';
-$a[]='By Subproject';
-$a[]='By User';
+$a[]=$Language->getText('reporting_ttbp','bytask');
+$a[]=$Language->getText('reporting_ttbp','bycategory');
+$a[]=$Language->getText('reporting_ttbp','bysubproject');
+$a[]=$Language->getText('reporting_ttbp','byuser');
 
 $a2[]='tasks';
 $a2[]='category';
@@ -54,7 +55,7 @@
 $a2[]='user';
 
 ?>
-<h3>Site-Wide Time Tracking</h3>
+<h3><?php echo $Language->getText('reporting','site_wide_time_tracking'); 
?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <input type="hidden" name="typ" value="<?php echo $typ; ?>">
@@ -62,7 +63,7 @@
 <td><strong>Type:</strong><br /><?php echo 
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
 <td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
 <td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>
@@ -73,7 +74,8 @@
        $labels = $report->labels;
        $data = $report->getData();
 
-       echo $HTML->listTableTop (array('Type','Time'));
+       echo $HTML->listTableTop 
(array($Language->getText('reporting_pa','type'),
+               $Language->getText('reporting_pa','time')));
 
        for ($i=0; $i<count($labels); $i++) {
 

Index: sitetime_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/sitetime_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sitetime_graph.php  28 Jul 2004 17:31:16 -0000      1.1
+++ sitetime_graph.php  4 Aug 2004 16:50:45 -0000       1.2
@@ -70,7 +70,7 @@
 $arr['user']='By User';
 
 $graph->title->Set("Time Report ".$arr[$type]." (".date('m/d/Y',$start) ."-". 
date('m/d/Y',$end) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 
 report_pie_arr($report->labels,$report->getData());
 

Index: sitetimebar.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/sitetimebar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sitetimebar.php     28 Jul 2004 17:31:16 -0000      1.1
+++ sitetimebar.php     4 Aug 2004 16:50:45 -0000       1.2
@@ -30,6 +30,7 @@
 require_once('common/reporting/Report.class');
 
 session_require( array('group'=>$sys_stats_group) );
+global $Language;
 
 $report=new Report();
 if ($report->isError()) {
@@ -41,17 +42,17 @@
        $start = $z[count($z)-1];
 }
 
-echo report_header('Site-Wide Time Tracking');
+echo report_header($Language->getText('reporting','site_wide_time_tracking'));
 
 ?>
-<h3>Site-Wide Time Tracking</h3>
+<h3><?php echo $Language->getText('reporting','site_wide_time_tracking'); 
?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <input type="hidden" name="typ" value="<?php echo $typ; ?>">
 <table><tr>
-<td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-<td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+<td><strong><?php echo $Language->getText('reporting','end'); ?>:</strong><br 
/><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><input type="submit" name="submit" value="<?php 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>
@@ -76,7 +77,8 @@
        $report->setData($res,1);
        $data=$report->getData();
        $labels=$report->getDates();
-       echo $HTML->listTableTop (array('Week','Time'));
+       echo $HTML->listTableTop (array($Language->getText('reporting','week'),
+                       $Language->getText('reporting','time')));
 
        for ($i=0; $i<count($labels); $i++) {
 

Index: sitetimebar_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/sitetimebar_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sitetimebar_graph.php       28 Jul 2004 17:31:16 -0000      1.1
+++ sitetimebar_graph.php       4 Aug 2004 16:50:45 -0000       1.2
@@ -87,7 +87,7 @@
 
 // Setup the titles
 $graph->title->Set("Hours Recorded (".date('m/d/Y',$start) ."-". 
date('m/d/Y',$end) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 $graph->xaxis->title->Set("Date");
 $graph->yaxis->title->Set("Hours");
 

Index: timeadd.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/timeadd.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- timeadd.php 28 Jul 2004 17:31:16 -0000      1.1
+++ timeadd.php 4 Aug 2004 16:50:45 -0000       1.2
@@ -33,6 +33,8 @@
        exit_not_logged_in();
 }
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error('Error',$report->getErrorMessage());
@@ -69,7 +71,7 @@
                        if (!$res || db_affected_rows($res) < 1) {
                                exit_error('Error',db_error());
                        } else {
-                               $feedback='Successfully Deleted';
+                               
$feedback=$Language->getText('reporting_ta','successfully_deleted');
                        }
                } else {
                        echo "$project_task_id && $report_date && 
$old_time_code";
@@ -87,11 +89,11 @@
                        if (!$res || db_affected_rows($res) < 1) {
                                exit_error('Error',db_error());
                        } else {
-                               $feedback='Successfully Added';
+                               
$feedback.=$Language->getText('reporting_ta','successfully_added');
                        }
                } else {
                        echo "$project_task_id && $week && $days_adjust && 
$time_code && $hours";
-                       exit_error('Error','All Field Are Required.');
+                       
exit_error('Error',$Language->getText('reporting_ta','error_field_required'));
                }
 
        }
@@ -99,7 +101,7 @@
 
 if ($week) {
 
-       report_header('Time Tracking');
+       report_header($Language->getText('reporting_ta','title'));
 
        if (!$group_project_id) {
                $respm=db_query("SELECT pgl.group_project_id,g.group_name || 
'**' || pgl.project_name
@@ -110,7 +112,7 @@
                ORDER BY group_name,project_name");
        }
        ?>
-       <h3>Time Entries For The Week Starting <?php echo date('Y-m-d',$week); 
?></h3>
+       <h3><?php echo 
$Language->getText('reporting_ta','time_entries',date('Y-m-d',$week)); ?></h3>
        <p>
        <?php
        $res=db_query("SELECT pt.project_task_id, pgl.project_name || '**' || 
pt.summary AS name, 
@@ -127,10 +129,10 @@
        $rows=db_numrows($res);
        if ($group_project_id || $rows) {
 
-               $title_arr[]='Project/Task';
-               $title_arr[]='Date';
-               $title_arr[]='Hours';
-               $title_arr[]='Category';
+               $title_arr[]=$Language->getText('reporting_ta','project_task');
+               $title_arr[]=$Language->getText('reporting_ta','date');
+               $title_arr[]=$Language->getText('reporting_ta','hours');
+               $title_arr[]=$Language->getText('reporting_ta','category');
                $title_arr[]=' ';
 
                echo $HTML->listTableTop ($title_arr);
@@ -146,7 +148,7 @@
                                <td align="middle"><!-- <input type="text" 
name="hours" value="'. $r['hours'] .'" size="3" maxlength="3" /> 
-->'.$r['hours'].'</td>
                                <td align="middle"><!-- 
'.report_time_category_box('time_code',$r['time_code']).' 
-->'.$r['category_name'].'</td>
                                <td align="middle"><!-- <input type="submit" 
name="update" value="Update" /> -->
-                               <input type="submit" name="delete" 
value="Delete" /></td>
+                               <input type="submit" name="delete" value="'. 
$Language->getText('reporting_ta','delete').'" /></td>
                        </tr></form>';
                        $total_hours += $r['hours'];
                }
@@ -161,29 +163,29 @@
                                <td align="middle"><input type="text" 
name="report_date" value="'. date('Y-m-d',$week) .'" size="10" maxlength="10" 
/></td>
                                <td align="middle"><input type="text" 
name="hours" value="" size="3" maxlength="3" /></td>
                                <td 
align="middle">'.report_time_category_box('time_code',false).'</td>
-                               <td align="middle"><input type="submit" 
name="add" value="Add" /><input type="submit" name="cancel" value="Cancel" 
/></td>
+                               <td align="middle"><input type="submit" 
name="add" value="'.
+                               $Language->getText('reporting','add').'" 
/><input type="submit" name="cancel" 
value="'.$Language->getText('reporting_ta','cancel').'" /></td>
                        </tr></form>';
 
                }
-               echo '<tr '.$HTML->boxGetAltRowStyle($xi++).'><td 
colspan="2"><strong>Total 
Hours:</strong></td><td><strong>'.$total_hours.'</strong></td><td 
colspan="2"></td></tr>';
+               echo '<tr '.$HTML->boxGetAltRowStyle($xi++).'><td 
colspan="2"><strong>'.$Language->getText('reporting_ta','total_hours').':</strong></td><td><strong>'.$total_hours.'</strong></td><td
 colspan="2"></td></tr>';
                echo $HTML->listTableBottom();
 
        }
        if (!$group_project_id) {
                ?>
                <p>
-               <h3>Add Entry</h3>
+               <h3><?php echo $Language->getText('reporting_ta','add_entry'); 
?></h3>
                <p>
-               Choose a Project/Subproject in the Task Manager. You will then 
have to choose 
-               a Task and category to record your time in.
+               <?php echo 
$Language->getText('reporting_ta','add_entry_description'); ?>
                <p>
                <form action="<?php echo $PHP_SELF; ?>" method="get" />
                <input type="hidden" name="week" value="<?php echo $week; ?>" />
                <table>
                <tr>
-                       <td><strong>Task Manager Project:</strong></td>
+                       <td><strong><?php echo 
$Language->getText('reporting_ta','task_mgr_project'); ?>:</strong></td>
                        <td><?php echo html_build_select_box 
($respm,'group_project_id',false,false); ?></td>
-                       <td><input type="submit" name="submit" value="Next" 
/></td>
+                       <td><input type="submit" name="submit" value="<?php 
echo $Language->getText('reporting','next'); ?>" /></td>
                </tr>
                </table>
                </form>
@@ -191,7 +193,7 @@
                <h3>Change Week</h3>
                <p>
                <form action="<?php echo $PHP_SELF; ?>" method="get" />
-               <?php echo report_weeks_box($report,'week'); ?><input 
type="submit" name="submit" value="Change Week" />
+               <?php echo report_weeks_box($report,'week'); ?><input 
type="submit" name="submit" value="<?php echo 
$Language->getText('reporting_ta','change_week'); ?>" />
                </form>
                <?php
        }
@@ -200,19 +202,18 @@
 //
 } else {
 
-       report_header('Time Tracking');
+       report_header($Language->getText('reporting_ta','title'));
 
        ?>
-       <h3>Choose A Week to Record Or Edit Your Time.</h3>
+       <h3><?php echo $Language->getText('reporting_ta','choose_entry'); 
?></h3>
        <p>
-       After you choose a week, you will be prompted to choose a 
Project/Subproject in the 
-       Task Manager.
+       <?php echo 
$Language->getText('reporting_ta','choose_entry_description'); ?>
        <p>
        <form action="<?php echo $PHP_SELF; ?>" method="get" />
-       <strong>Week Starting:</strong><br />
+       <strong><?php echo $Language->getText('reporting_ta','week_starting'); 
?>:</strong><br />
        <?php echo report_weeks_box($report,'week'); ?>
        <p>
-       <input type="submit" name="submit" value="Next" />
+       <input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','next'); ?>" />
        </form>
        <?php
 

Index: timecategory.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/timecategory.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- timecategory.php    28 Jul 2004 17:31:16 -0000      1.1
+++ timecategory.php    4 Aug 2004 16:50:45 -0000       1.2
@@ -30,7 +30,7 @@
 require_once('common/reporting/ReportSetup.class');
 
 session_require( array('group'=>$sys_stats_group,'A') );
-
+global $Language;
 
 if ($submit) {
        if ($add) {
@@ -39,7 +39,7 @@
                if (!$r->addTimeCode($category_name)) {
                        exit_error('Error',$r->getErrorMessage());
                } else {
-                       $feedback="Successful";
+                       
$feedback=$Language->getText('reporting_tc','successful');
                }
 
        } elseif ($update) {
@@ -49,7 +49,7 @@
                if (!$r->updateTimeCode($time_code,$category_name)) {
                        exit_error('Error',$r->getErrorMessage());
                } else {
-                       $feedback="Successful";
+                       
$feedback=$Language->getText('reporting_tc','successful');
                }
 
                $time_code=false;
@@ -58,7 +58,7 @@
 
 }
 
-echo report_header('Main Page');
+echo report_header($Language->getText('reporting_tc','title'));
 
 if ($time_code) {
        $res1=db_query("SELECT * FROM rep_time_category WHERE 
time_code='$time_code'");
@@ -66,8 +66,8 @@
 }
 $res=db_query("SELECT * FROM rep_time_category");
 
-$arr[]='Time Code';
-$arr[]='Category Name';
+$arr[]=$Language->getText('reporting_tc','time_code');
+$arr[]=$Language->getText('reporting_tc','category_name');
 
 echo $HTML->listTableTop($arr);
 
@@ -79,10 +79,9 @@
 echo $HTML->listTableBottom();
 
 ?>
-<h3>Manage Time Tracker Categories</h3>
+<h3><?php echo $Language->getText('reporting_tc','title2'); ?></h3>
 <p>
-You can create categories for how time might be spent when completing a 
particular task.
-Examples of categories include "Meeting", "Coding", "Testing".
+<?php echo $Language->getText('reporting_tc','description'); ?>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="post">
 <input type="hidden" name="submit" value="1" />
@@ -93,9 +92,9 @@
 <?php
 
 if ($time_code) { 
-       echo '<input type="submit" name="update" value="Update" />';
+       echo '<input type="submit" name="update" 
value="'.$Language->getText('reporting','update').'" />';
 } else {
-       echo '<input type="submit" name="add" value="Add" />';
+       echo '<input type="submit" name="add" 
value="'.$Language->getText('reporting','add').'" />';
 }
 
 ?>

Index: toolspie.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/toolspie.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toolspie.php        28 Jul 2004 17:31:16 -0000      1.1
+++ toolspie.php        4 Aug 2004 16:50:45 -0000       1.2
@@ -29,6 +29,8 @@
 require_once('common/reporting/report_utils.php');
 require_once('common/reporting/Report.class');
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -41,21 +43,21 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
-echo report_header('Tool Pie Graphs');
+echo report_header($Language->getText('reporting_pie','title'));
 
 if (!isset($datatype)) {
        $datatype=1;
 }
 
 ?>
-<h3>Tool Pie Graphs</h3>
+<h3><?php echo $Language->getText('reporting_pie','title'); ?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <table><tr>
-<td><strong>Trackers:</strong><br /><?php echo 
report_tracker_box('datatype',$datatype); ?></td>
-<td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-<td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><strong><?php echo $Language->getText('reporting_pie','trackers'); 
?>:</strong><br /><?php echo report_tracker_box('datatype',$datatype); ?></td>
+<td><strong><?php echo $Language->getText('reporting_pie','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+<td><strong><?php echo $Language->getText('reporting_pie','end'); 
?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>

Index: toolspie_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/toolspie_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toolspie_graph.php  28 Jul 2004 17:31:16 -0000      1.1
+++ toolspie_graph.php  4 Aug 2004 16:50:45 -0000       1.2
@@ -129,7 +129,7 @@
 $arr[6]='Tasks';
 $arr[7]='Downloads';
 $graph->title->Set($arr[$datatype]." By Project (".date('m/d/Y',$start) ."-". 
date('m/d/Y',$end) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 
 // Create the tracker open plot
 report_pie_arr(util_result_column_to_array($res,0), 
util_result_column_to_array($res,1));

Index: trackerpie_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/trackerpie_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trackerpie_graph.php        28 Jul 2004 17:31:16 -0000      1.1
+++ trackerpie_graph.php        4 Aug 2004 16:50:45 -0000       1.2
@@ -118,7 +118,7 @@
 $arr['resolution']='By Resolution';
 $arr['technician']='By Tecnician';
 $graph->title->Set($arr[$area]." (".date('m/d/Y',$start) ."-". 
date('m/d/Y',$end) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 
 // Create the tracker open plot
 report_pie_arr(util_result_column_to_array($res,0), 
util_result_column_to_array($res,1));

Index: useract.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/useract.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- useract.php 28 Jul 2004 17:31:16 -0000      1.1
+++ useract.php 4 Aug 2004 16:50:45 -0000       1.2
@@ -31,6 +31,8 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -41,10 +43,10 @@
        $start = $z[count($z)-1];
 }
 
-echo report_header('User Activity');
+echo report_header($Language->getText('reporting','user_activity_title'));
 
 $abc_array = 
array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
-echo "Choose the <strong>First Letter</strong> of the name of the person you 
wish to report on.<p>";
+echo $Language->getText('reporting_ua','description');
 for ($i=0; $i<count($abc_array); $i++) {
        if ($sw == $abc_array[$i]) {
                echo '<strong>'.$abc_array[$i].'</strong>&nbsp;';
@@ -55,17 +57,17 @@
 
 if ($sw) {
        ?>
-       <h3>User Activity</h3>
+       <h3><?php echo $Language->getText('reporting','user_activity_title'); 
?></h3>
        <p>
        <form action="<?php echo $PHP_SELF; ?>" method="get">
        <input type="hidden" name="sw" value="<?php echo $sw; ?>">
        <table><tr>
-       <td><strong>User:</strong><br /><?php echo 
report_useract_box('dev_id',$dev_id,$sw); ?></td>
-       <td><strong>Area:</strong><br /><?php echo 
report_area_box('area',$area); ?></td>
-       <td><strong>Type:</strong><br /><?php echo 
report_span_box('SPAN',$SPAN); ?></td>
-       <td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-       <td><strong>End:</strong><br /><?php echo report_months_box($report, 
'end', $end); ?></td>
-       <td><input type="submit" name="submit" value="Refresh"></td>
+       <td><strong><?php echo $Language->getText('reporting','user'); 
?>:</strong><br /><?php echo report_useract_box('dev_id',$dev_id,$sw); ?></td>
+       <td><strong><?php echo $Language->getText('reporting','area'); 
?>:</strong><br /><?php echo report_area_box('area',$area); ?></td>
+       <td><strong><?php echo $Language->getText('reporting','type'); 
?>:</strong><br /><?php echo report_span_box('SPAN',$SPAN); ?></td>
+       <td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+       <td><strong><?php echo $Language->getText('reporting','end'); 
?>:</strong><br /><?php echo report_months_box($report, 'end', $end); ?></td>
+       <td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
        </tr></table>
        </form>
        <p>

Index: useract_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/useract_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- useract_graph.php   28 Jul 2004 17:31:16 -0000      1.1
+++ useract_graph.php   4 Aug 2004 16:50:45 -0000       1.2
@@ -126,7 +126,7 @@
 //
 $graph->title->Set("User Activity For: ".$u->getRealName() 
        ." (".date('m/d/Y',$report->getStartDate()) ."-". 
date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Index: useradded.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/useradded.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- useradded.php       28 Jul 2004 17:31:16 -0000      1.1
+++ useradded.php       4 Aug 2004 16:50:45 -0000       1.2
@@ -29,6 +29,8 @@
 require_once('common/reporting/report_utils.php');
 require_once('common/reporting/Report.class');
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error('Error',$report->getErrorMessage());
@@ -41,17 +43,17 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
-echo report_header('Users Added');
+echo report_header($Language->getText('reporting','users_added_title'));
 
 ?>
-<h3>Users Added</h3>
+<h3><?php echo $Language->getText('reporting','users_added_title'); ?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <table><tr>
-<td><strong>Type:</strong><br /><?php echo report_span_box('SPAN',$SPAN); 
?></td>
-<td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-<td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><strong><?php echo $Language->getText('reporting','type'); ?>:</strong><br 
/><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+<td><strong><?php echo $Language->getText('reporting','end'); ?>:</strong><br 
/><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>

Index: useradded_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/useradded_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- useradded_graph.php 28 Jul 2004 17:31:16 -0000      1.1
+++ useradded_graph.php 4 Aug 2004 16:50:45 -0000       1.2
@@ -64,7 +64,7 @@
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set("Users Added ".$report->getSpanName()
        ." (".date('m/d/Y',$report->getStartDate()) ."-". 
date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Index: usercum.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/usercum.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usercum.php 28 Jul 2004 17:31:16 -0000      1.1
+++ usercum.php 4 Aug 2004 16:50:45 -0000       1.2
@@ -29,6 +29,8 @@
 require_once('common/reporting/report_utils.php');
 require_once('common/reporting/Report.class');
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -41,17 +43,17 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
-echo report_header('Cumulative Users');
+echo report_header($Language->getText('reporting','cumulative_users_title'));
 
 ?>
-<h3>Cumulative Users</h3>
+<h3><?php echo $Language->getText('reporting','cumulative_users_title'); 
?></h3>
 <p>
 <form action="<?php echo $PHP_SELF; ?>" method="get">
 <table><tr>
-<td><strong>Type:</strong><br /><?php echo report_span_box('SPAN',$SPAN); 
?></td>
-<td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
-<td><strong>End:</strong><br /><?php echo report_months_box($report, 'end', 
$end); ?></td>
-<td><input type="submit" name="submit" value="Refresh"></td>
+<td><strong><?php echo $Language->getText('reporting','type'); ?>:</strong><br 
/><?php echo report_span_box('SPAN',$SPAN); ?></td>
+<td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_months_box($report, 'start', $start); 
?></td>
+<td><strong><?php echo $Language->getText('reporting','end'); ?>:</strong><br 
/><?php echo report_months_box($report, 'end', $end); ?></td>
+<td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
 </tr></table>
 </form>
 <p>

Index: usercum_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/usercum_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usercum_graph.php   28 Jul 2004 17:31:16 -0000      1.1
+++ usercum_graph.php   4 Aug 2004 16:50:45 -0000       1.2
@@ -64,7 +64,7 @@
 //$graph->SetMargin(10,10,25,10);
 $graph->title->Set("Cumulative Users ".$report->getSpanName()
        ." (".date('m/d/Y',$report->getStartDate()) ."-". 
date('m/d/Y',$report->getEndDate()) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 //$graph->xaxis-> title->Set("Date" );
 //$graph->yaxis-> title->Set("Number" ); 
 

Index: usersummary.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/usersummary.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usersummary.php     28 Jul 2004 17:31:16 -0000      1.1
+++ usersummary.php     4 Aug 2004 16:50:45 -0000       1.2
@@ -31,6 +31,8 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -47,28 +49,27 @@
        $tstat='1';
 }
 
-$n[]='Any';
-$n[]='Open';
-$n[]='Closed';
+$n[]=$Language->getText('reporting_us','any');
+$n[]=$Language->getText('reporting_us','open');
+$n[]=$Language->getText('reporting_us','closed');
 
 $l[]='1,2';
 $l[]='1';
 $l[]='2';
 
-echo report_header('User Summary Report');
+echo report_header($Language->getText('reporting_us','title'));
 
        ?>
-       <h3>User Summary Report</h3>
+       <h3><?php echo $Language->getText('reporting_us','title'); ?></h3>
        <p>
-       Choose the range from the pop-up boxes below. The report will list all 
tasks with an open 
-       date in that range.
+       <?php echo $Language->getText('reporting_us','description'); ?>
        <p>
     <form action="<?php echo $PHP_SELF; ?>" method="get">
     <table><tr>
-    <td><strong>Start:</strong><br /><?php echo report_weeks_box($report, 
'start', $start); ?></td>
-    <td><strong>End:</strong><br /><?php echo report_weeks_box($report, 'end', 
$end); ?></td>
-       <td><strong>Task Status:</strong><br /><?php echo 
html_build_select_box_from_arrays($l,$n,'tstat',$tstat,false); ?></td>
-    <td><input type="submit" name="submit" value="Refresh"></td>
+    <td><strong><?php echo $Language->getText('reporting','start'); 
?>:</strong><br /><?php echo report_weeks_box($report, 'start', $start); ?></td>
+    <td><strong><?php echo $Language->getText('reporting','end'); 
?>:</strong><br /><?php echo report_weeks_box($report, 'end', $end); ?></td>
+       <td><strong><?php echo 
$Language->getText('reporting_us','task_status'); ?>:</strong><br /><?php echo 
html_build_select_box_from_arrays($l,$n,'tstat',$tstat,false); ?></td>
+    <td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
        </tr></table>
        </form>
        <p>
@@ -93,17 +94,17 @@
 
 $res=db_query($sql);
 if (!$res || db_numrows($res) < 1) {
-       echo 'No Matches Found'.db_error();
+       echo $Language->getText('reporting_us','no_matches').db_error();
 } else {
 
        echo '<table border="1">
                        <tr>
-                               <td><strong>Name</strong></td>
-                               <td><strong>Task</strong></td>
-                               <td><strong>Status</strong></td>
-                               <td><strong>Cum. Hrs</strong></td>
-                               <td><strong>Rem. Hrs</strong></td>
-                               <td><strong>End Date</strong></td>
+                               
<td><strong>'.$Language->getText('reporting_us','name').'</strong></td>
+                               
<td><strong>'.$Language->getText('reporting_us','task').'</strong></td>
+                               
<td><strong>'.$Language->getText('reporting_us','status').'</strong></td>
+                               
<td><strong>'.$Language->getText('reporting_us','cum_hrs').'</strong></td>
+                               
<td><strong>'.$Language->getText('reporting_us','rem_hrs').'</strong></td>
+                               
<td><strong>'.$Language->getText('reporting_us','end_date').'</strong></td>
                        </tr>';
        for ($i=0; $i<db_numrows($res); $i++) {
                $name=db_result($res,$i,'realname');

Index: usertime.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/usertime.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usertime.php        28 Jul 2004 17:31:16 -0000      1.1
+++ usertime.php        4 Aug 2004 16:50:45 -0000       1.2
@@ -31,6 +31,8 @@
 
 session_require( array('group'=>$sys_stats_group) );
 
+global $Language;
+
 $report=new Report();
 if ($report->isError()) {
        exit_error($report->getErrorMessage());
@@ -42,10 +44,11 @@
 }
 
 
-echo report_header('User Time Reporting');
+echo report_header($Language->getText('reporting_ut','title'));
 
 $abc_array = 
array('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z');
-echo "Choose the <strong>First Letter</strong> of the name of the person you 
wish to report on.<p>";
+echo $Language->getText('reporting_ut','description');
+
 for ($i=0; $i<count($abc_array); $i++) {
        if ($sw == $abc_array[$i]) {
                echo '<strong>'.$abc_array[$i].'</strong>&nbsp;';
@@ -56,16 +59,16 @@
 
 if ($sw) {
 
-       $a[]='By Task';
-       $a[]='By Category';
-       $a[]='By Subproject';
+       $a[]=$Language->getText('reporting_ttbp','bytask');
+       $a[]=$Language->getText('reporting_ttbp','bycategory');
+       $a[]=$Language->getText('reporting_ttbp','bysubproject');
 
        $a2[]='tasks';
        $a2[]='category';
        $a2[]='subproject';
 
        ?>
-       <h3>User Time Reporting</h3>
+       <h3><?php echo $Language->getText('reporting_ut','title'); ?></h3>
        <p>
        <form action="<?php echo $PHP_SELF; ?>" method="get">
        <input type="hidden" name="sw" value="<?php echo $sw; ?>">
@@ -75,7 +78,7 @@
        <td><strong>Type:</strong><br /><?php echo 
html_build_select_box_from_arrays($a2,$a,'type',$type,false); ?></td>
        <td><strong>Start:</strong><br /><?php echo report_months_box($report, 
'start', $start); ?></td>
        <td><strong>End:</strong><br /><?php echo report_months_box($report, 
'end', $end); ?></td>
-       <td><input type="submit" name="submit" value="Refresh"></td>
+       <td><input type="submit" name="submit" value="<?php echo 
$Language->getText('reporting','refresh'); ?>"></td>
        </tr></table>
        </form>
        <p>

Index: usertime_graph.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/reporting/usertime_graph.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usertime_graph.php  28 Jul 2004 17:31:16 -0000      1.1
+++ usertime_graph.php  4 Aug 2004 16:50:45 -0000       1.2
@@ -69,7 +69,7 @@
 $arr['subproject']='By Subproject';
 
 $graph->title->Set("Time Report ".$arr[$type]." (".date('m/d/Y',$start) ."-". 
date('m/d/Y',$end) .")");
-$graph->subtitle->Set($report_company_name);
+$graph->subtitle->Set($sys_name);
 
 // Create the tracker open plot
 //$data  =& $report->getData();





reply via email to

[Prev in Thread] Current Thread [Next in Thread]