phpbt-dev — Developer's mailing list and cvs commits

[phpBT-dev] CVS: phpbt upgrade.php,1.22,1.23

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

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv20386

Modified Files:
	upgrade.php 
Log Message:
Getting ready for 0.9.0.  No pgsql or oracle support yet

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/upgrade.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- upgrade.php	8 Apr 2002 17:05:52 -0000	1.22
+++ upgrade.php	4 Aug 2002 16:29:01 -0000	1.23
@@ -30,43 +30,37 @@
 function upgrade() {
 	global $db;
 	
-	// Note, no upgrades for oracle since we didn't support oracle before 0.8.0
-	$upgraded = $db->getOne('select varname from '.TBL_CONFIGURATION.' where varname = \'FORCE_LOGIN\'');
+	$upgraded = $db->getOne('select varname from '.TBL_CONFIGURATION.' where varname = \'BUG_UNCONFIRMED\'');
 	if (!$upgraded or DB::isError($upgraded)) {
 		if (!@is_writeable('c_templates')) {
 			include('templates/default/base/templatesperm.html');
 			exit;
 		}
-		// Convert the sequences
-		if (DB_TYPE == 'mysql') {
-			// Just in case we have someone who started using phpbt a long time ago...
-			$db->query('update '.TBL_DB_SEQUENCE.' set seq_name = lower(seq_name)');
+		switch(DB_TYPE) {
+			case 'pgsql' :
+				break;
+			case 'mysql' :
+				$db->query("alter table ".TBL_USER_PREF." add saved_queries tinyint(1) not null default '1' after email_notices");
+				$db->query("alter table ".TBL_BUG_HISTORY." change changed_field changed_field varchar(30) not null");
+				$db->query("alter table ".TBL_BUG." add database_id int not null after resolution_id, add site_id int not null after database_id, add closed_in_version_id int not null after version_id, add to_be_closed_in_version_id int not null after closed_in_version_id");
+				$db->query("create table ".TBL_SITE." (site_id int unsigned NOT NULL default '0', site_name varchar(50) NOT NULL default '', sort_order tinyint(3) unsigned NOT NULL default '0', PRIMARY KEY (site_id))");
+				$db->query("create table ".TBL_SITE."_seq (id int unsigned auto_increment not null primary key)");
+				$db->query("insert into ".TBL_SITE."_seq values (4)");
+				$db->query("create table ".TBL_DATABASE." (database_id int(10) unsigned NOT NULL default '0', database_name varchar(30) NOT NULL default '', database_version varchar(10) NOT NULL default '', sort_order tinyint(3) unsigned NOT NULL default '0', PRIMARY KEY (database_id))");
+				$db->query("create table ".TBL_DATABASE."_seq (id int unsigned auto_increment not null primary key)");
+				$db->query("insert into ".TBL_DATABASE."_seq values (3)");
+				break;
+			case 'oci8' :
+				break;
 		}
-		$rs = $db->query("select * from ".TBL_DB_SEQUENCE);
-		if (DB_TYPE == 'pgsql') {
-			// Set up the user prefs table
-			$db->query("CREATE TABLE ".TBL_USER_PREF." ( user_id INT4  NOT NULL DEFAULT '0', email_notices INT2  NOT NULL DEFAULT '1', PRIMARY KEY  (user_id) )");
-			$db->query("CREATE TABLE ".TBL_BUG_DEPENDENCY." ( bug_id INT4  NOT NULL DEFAULT '0', depends_on INT4  NOT NULL DEFAULT '0', PRIMARY KEY  (bug_id,depends_on) )");
-			$db->query("insert into ".TBL_USER_PREF." (user_id) select user_id from ".TBL_AUTH_USER);
-			// Move the sequences
-			while ($rs->fetchInto($row)) {
-				$db->query("create sequence {$row['seq_name']}_seq start {$row['nextid']}");
-			}
-		} else {
-			// Set up the user prefs table
-			$db->query("CREATE TABLE ".TBL_USER_PREF." ( user_id int(11) NOT NULL default '0', email_notices tinyint(1) NOT NULL default '1', PRIMARY KEY  (user_id) )");
-			$db->query("CREATE TABLE ".TBL_BUG_DEPENDENCY." ( bug_id int(10) unsigned NOT NULL default '0', depends_on int(10) unsigned NOT NULL default '0', PRIMARY KEY  (bug_id,depends_on) )");
-			$db->query("insert into ".TBL_USER_PREF." (user_id) select user_id from ".TBL_AUTH_USER);
-			// Move the sequences
-			while ($rs->fetchInto($row)) {
-				$db->query("create table {$row['seq_name']}_seq (id int unsigned auto_increment not null primary key)");
-				$db->query("insert into {$row['seq_name']}_seq values ({$row['nextid']})");
-			}
-		}
-		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('RECALL_LOGIN','0','Enable use of cookies to store username between logins','bool')");
-		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('SHOW_PROJECT_SUMMARIES', '1', 'Itemize bug stats by project on the home page', 'bool')");
-		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('FORCE_LOGIN', '0', 'Force users to login before being able to use the bug tracker', 'bool')");
-		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi')");
+		
+		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('SEND_MIME_EMAIL', '1', 'Whether to use MIME quoted-printable encoded emails or not', 'bool')");
+		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('BUG_UNCONFIRMED', '1', 'The status to assign a bug when it is first submitted.', 'multi')");
+		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('BUG_PROMOTED', '2', 'The status to assign a bug when it is promoted (if enabled).', 'multi')");
+		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('BUG_ASSIGNED', '3', 'The status to assign a bug when it is assigned.', 'multi')");
+		$db->query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('BUG_REOPENED', '4', 'The status to assign a bug when it is reopened.', 'multi')");
+		$db->query("INSERT INTO ".TBL_SITE." VALUES (0,'All',1), (1,'Development',2), (2,'Testing',3), (3,'Staging',4), (4,'Production',5)");
+		$db->query("INSERT INTO ".TBL_DATABASE." VALUES (1,'Oracle','8.1.7',1), (2,'MySQL','3.23.49',2), (3,'PostgreSQL','7.1.3',3");
 	}
 	include 'templates/default/upgrade-finished.html';
 }

[phpBT-dev] CVS: phpbt CHANGELOG,1.57,1.58

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

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv13374

Modified Files:
	CHANGELOG 
Log Message:


Index: CHANGELOG
===================================================================
RCS file: /cvsroot/phpbt/phpbt/CHANGELOG,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- CHANGELOG	9 May 2002 03:04:42 -0000	1.57
+++ CHANGELOG	3 Aug 2002 18:56:54 -0000	1.58
@@ -1,3 +1,14 @@
+-- 0.9.0 --
+: Replaced the mail function with one that encodes (i18n support).
+: Added four additional fields for tracking bug information: Database type 
+  and version, Environment, Closed Version, To-be-closed Version.
+: Removed English text from templates for better localization.
+: Added option for sending emails MIME-encapsulated.
+: Cleaned up HTML
+: Added list of saved queries to the home page and an option to disable that 
+  list.
+: Updated translations.
+
 -- 0.8.2 -- 8 May 2002
 : Fixed bugs with ordering by dates in the bug list, self-referencing URLs
   pointing to php.exe on windows, errors with the attachment list when not

[phpBT-dev] MIME email?

[Ben C. <php...@be...>]

Is the MIME email functionality well tested and functional?

[phpBT-dev] CVS: phpbt/templates/default buglist.html,1.7,1.8

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

Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv14992/templates/default

Modified Files:
	buglist.html 
Log Message:
Hide the bug count if no bugs are found

Index: buglist.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/buglist.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buglist.html	18 May 2002 03:00:50 -0000	1.7
+++ buglist.html	29 Jul 2002 12:41:47 -0000	1.8
@@ -23,11 +23,13 @@
 			</td>
 		</tr>
 	{/section}
+	{if $smarty.section.bug.total}
 	<tr>
 		<td colspan="{$smarty.section.col.loop}" align="center">
 			<br>
-  		{$first} - {$last} of {$total}<br>[ {$pages} ]<!-- <a href="bugs.php?page=all">Show all</a>-->
-  		<br>
+			{$first} - {$last} of {$total}<br>[ {$pages} ]<!-- <a href="bugs.php?page=all">Show all</a>-->
+			<br>
 		</td>
 	</tr>
+	{/if}
 </table>

[phpBT-dev] CVS: phpbt install.php,1.29,1.30

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

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv10811

Modified Files:
	install.php 
Log Message:
Add a little more info to the database error message

Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- install.php	13 Jun 2002 14:26:34 -0000	1.29
+++ install.php	29 Jul 2002 12:26:18 -0000	1.30
@@ -168,7 +168,7 @@
     <br>
     Please check these details are correct and that the database already exists then retry.
     </div>
-    ');
+    <br>'.$db->message.'<br>'.$db->userinfo);
   }
 
 

[phpBT-dev] CVS: phpbt/languages pl_iso-8859-2.php,NONE,1.1

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

Update of /cvsroot/phpbt/phpbt/languages
In directory usw-pr-cvs1:/tmp/cvs-serv4774/languages

Added Files:
	pl_iso-8859-2.php 
Log Message:
Polish translation by Krystian Brazulewicz

--- NEW FILE: pl_iso-8859-2.php ---
<?php

// pl_iso-8859-2.php - Polish strings and titles encoded in iso-8859-2 codepage
// ------------------------------------------------------------------------
// Copyright (c) 2001 The phpBugTracker Group
// ------------------------------------------------------------------------
// This file is part of phpBugTracker
//
// phpBugTracker is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
// 
// phpBugTracker is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
// 
// You should have received a copy of the GNU General Public License
// along with phpBugTracker; if not, write to the Free Software Foundation,
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// ------------------------------------------------------------------------
// $Id: pl_iso-8859-2.php,v 1.1 2002/07/29 12:11:56 bcurtis Exp $

$STRING = array(
	'lang_charset' => 'ISO-8859-2',
	'nouser' => 'U¿ytkownik nie istnieje',
	'dupeofself' => 'B³±d nie mo¿e byæ duplikatem samego siebie',
	'nobug' => 'B³±d nie istnieje',
	'givesummary' => 'Wpisz podsumowanie',
	'givedesc' => 'Wpisz opis',
	'noprojects' => 'Nie znaleziono projektów',
	'totalbugs' => 'Razem b³êdów',
	'giveemail' => 'Podaj prawid³owy adres email',
	'givelogin' => 'Podaj login',
	'loginused' => 'Ten login jest ju¿ u¿ywany',
	'newacctsubject' => 'phpBugTracker Login',
	'newacctmessage' => "Twoje has³o do phpBugTracker\'a to %s",
	'nobugs' => 'Nie znaleziono ¿adnych b³êdów',
	'givename' => 'Podaj nazwê',
	'edit' => 'Edycja',
	'addnew' => 'Dodaj nowy',
	'nooses' => 'Nie znaleziono systemów operacyjnych',
	'giveinitversion' => 'Podaj inicjaln± wersjê dla projektu',
	'giveversion' => 'Podaj wersjê',
	'noversions' => 'Nie znaleziono wersji',
	'nocomponents' => 'Nie znaleziono komponentów',
	'nostatuses' => 'Nie znaleziono statusów b³êdów',
	'noseverities' => 'Nie znaleziono wag b³êdów',
	'givepassword' => 'Podaj has³o',
	'nousers' => 'Nie znaleziono u¿ytkowników',
	'bugbadperm' => 'Nie mo¿esz zmieniæ tego b³êdu',
	'bugbadnum' => 'B³±d nie istnieje',
	'datecollision' => 'Kto¶ zaktualizowa³ ten b³±d od czasu gdy go ogl±dasz. Informacje o b³êdzie zosta³y do¶wie¿one.',
	'passwordmatch' => 'Has³a nie zgadzaj± siê -- spróbuj ponownie',
	'nobughistory' => 'Ten b³±d nie ma historii',
	'logintomodify' => 'Musisz byæ zalogowany aby modyfikowaæ ten b³±d',
	'dupe_attachment' => 'Za³±cznik jest ju¿ skojarzony z tym b³êdem',
	'give_attachment' => 'Podaj nazwê pliku do za³adowania',
	'no_attachment_save_path' => 'Nie mogê znale¼æ ¶cie¿ki do zachowania pliku!',
	'attachment_path_not_writeable' => 'Nie mogê stworzyæ pliku w ¶cie¿ce zachowywania plików!',
	'attachment_move_error' => 'W czasie przenoszenia wgranego pliku wyst±pi³ b³±d',
	'bad_attachment' => 'Za³±cznik nie istnieje',
	'attachment_too_large' => 'Wybrany plik jest wiêkszy ni¿ '.number_format(ATTACHMENT_MAX_SIZE).' bajtów',
	'bad_permission' => 'Nie masz uprawnieñ wymaganych do tej funkcji',
	'project_only_all_groups' => 'Nie mo¿esz zmieniaæ konkretnych grup kiedy wybrano "Wszystkie grupy"',
	'previous_bug' => 'Poprzedni',
	'next_bug' => 'Nastêpny',
	'already_voted' => 'G³osowa³e¶ ju¿ na ten b³±d',
	'too_many_votes' => 'Osi±gn±³e¶ maksymaln± liczbê g³osów na przydzielon± u¿ytkownikowi',
	'no_votes' => 'Na ten b³±d nie oddano ¿adnych g³osów',
	'user_filter' => array(
		0 => 'Wszyscy u¿ytkownicy',
		1 => 'Aktywni u¿ytkownicy',
		2 => 'Nieaktywni u¿ytkownicy'),
	'dupe_dependency' => 'Ta zale¿no¶æ pomiêdzy b³êdami zosta³a ju¿ dodana',
	'image_path_not_writeable' => 'Podkatalog "jpgimages" nie mo¿e byæ zapisywany przez proces serwera WWW - nie mo¿na wygenerowaæ podsumowania'
	);
	
// Page titles
$TITLE = array(
	'enterbug' => 'Wpisz b³±d',
	'editbug' => 'Edytuj b³±d',
	'newaccount' => 'Stwórz nowe konto u¿ytkownika',
	'bugquery' => 'Przeszukiwanie bazy b³êdów',
	'buglist' => 'Lista b³êdów',
	'addcomponent' => 'Dodaj komponent',
	'editcomponent' => 'Edytuj komponent',
	'addproject' => 'Dodaj projekt',
	'editproject' => 'Edytuj projekt',
	'addversion' => 'Dodaj wersjê',
	'editversion' => 'Edytuj wersjê',
	'project' => 'Projekty',
	'os' => 'Systemy operacyjne',
	'resolution' => 'Rozpoznanie',
	'status' => 'Statusy',
	'severity' => 'Wagi',
	'user' => 'U¿ytkownicy',
	'home' => 'Strona g³ówna',
	'reporting' => 'Raportowanie',
	'group' => 'Grupy'
	);
	
?>

[phpBT-dev] CVS: phpbt bug.php,1.113,1.114

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

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv2878

Modified Files:
	bug.php 
Log Message:
Some formatting cleanup

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- bug.php	18 Jul 2002 13:02:12 -0000	1.113
+++ bug.php	29 Jul 2002 12:07:46 -0000	1.114
@@ -523,20 +523,20 @@
 }
 
 function show_form($bugid = 0, $error = '') {
-  global $db, $me, $t, $_gv, $_pv, $TITLE;
+	global $db, $me, $t, $_gv, $_pv, $TITLE;
 
-  $projectname = $db->getOne("select project_name from ".TBL_PROJECT." where project_id = {$_gv['project']}");
-  if ($bugid && !$error) {
-    $t->assign($db->getRow("select * from ".TBL_BUG." where bug_id = '$bugid'"));
-  } else {
+	$projectname = $db->getOne("select project_name from ".TBL_PROJECT." where project_id = {$_gv['project']}");
+	if ($bugid && !$error) {
+		$t->assign($db->getRow("select * from ".TBL_BUG." where bug_id = '$bugid'"));
+	} else {
 		$t->assign($_pv);
 		$t->assign(array(
 			'error' => $error,
 			'project' => $_gv['project'],
 			'projectname' => $projectname
 			));
-  }
-  $t->wrap('bugform.html', 'enterbug');
+	}
+	$t->wrap('bugform.html', 'enterbug');
 }
 
 function show_bug_printable($bugid) {
@@ -614,8 +614,8 @@
     global $db, $me, $t, $STRING, $TITLE, $u, $_gv, $QUERY, $restricted_projects;
 
     if (!ereg('^[0-9]+$',$bugid) or
-	!$row = $db->getRow(sprintf($QUERY['bug-show-bug'], $bugid, 
-	    $restricted_projects))) {
+		!$row = $db->getRow(sprintf($QUERY['bug-show-bug'], $bugid, 
+	    	$restricted_projects))) {
 		show_text($STRING['bugbadnum'],true);
 		return;
     }
@@ -657,9 +657,9 @@
 }
 
 function show_projects() {
-  global $db, $t, $STRING, $perm, $restricted_projects, $_gv;
+	global $db, $t, $STRING, $perm, $restricted_projects, $_gv;
 
-  // Show only active projects with at least one component
+	// Show only active projects with at least one component
 	if ($perm->have_perm('Admin')) { // Show admins all projects
 		$p_query = '';
 	} else { // Filter out projects that can't be seen by this user
@@ -672,15 +672,15 @@
 		' group by p.project_id, p.project_name, p.project_desc, p.created_date'.
 		' order by project_name');
 	
-  switch (count($projects)) {
-    case 0 :
-      show_text($STRING['noprojects'], true);
-      return;
-    case 1 :
-      $_gv['project'] = $projects[0]['project_id'];
-      show_form();
-      break;
-    default :
+	switch (count($projects)) {
+		case 0 :
+			show_text($STRING['noprojects'], true);
+			return;
+		case 1 :
+			$_gv['project'] = $projects[0]['project_id'];
+			show_form();
+			break;
+		default :
 			$t->assign('projects', $projects);
 			$t->wrap('projectlist.html', 'enterbug');
   }
@@ -688,35 +688,35 @@
 
 if ($op) {
     switch($op) {
-	case 'history':
-	    show_history($_gv['bugid']);
-	break;
-	case 'add':
-	    $perm->check('Editbug');
-	    if (isset($_gv['project'])) {
-		show_form();
-	    } else {
-		show_projects();
-	    }
-	break;
-	case 'show':
-	    show_bug($_gv['bugid']);
-	break;
-	case 'update':
-	    update_bug($_pv['bugid']);
-	break;
-	case 'do':
-	    do_form($_pv['bugid']);
-	break;
-	case 'print':
-	    show_bug_printable($_gv['bugid']);
-	break;
-	case 'vote':
-	    vote_bug($_gv['bugid']);
-	break;
-	case 'viewvotes':
-	    vote_view($_gv['bugid']);
-	break;
+		case 'history':
+			show_history($_gv['bugid']);
+			break;
+		case 'add':
+			$perm->check('Editbug');
+			if (isset($_gv['project'])) {
+				show_form();
+			} else {
+				show_projects();
+			}
+			break;
+		case 'show':
+			show_bug($_gv['bugid']);
+			break;
+		case 'update':
+			update_bug($_pv['bugid']);
+			break;
+		case 'do':
+			do_form($_pv['bugid']);
+			break;
+		case 'print':
+			show_bug_printable($_gv['bugid']);
+			break;
+		case 'vote':
+			vote_bug($_gv['bugid']);
+			break;
+		case 'viewvotes':
+			vote_view($_gv['bugid']);
+			break;
     }
 } else {
     header("Location: query.php");

[phpBT-dev] CVS: phpbt/templates/default bugdisplay.html,1.37,1.38

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

Update of /cvsroot/phpbt/phpbt/templates/default
In directory usw-pr-cvs1:/tmp/cvs-serv2772/templates/default

Modified Files:
	bugdisplay.html 
Log Message:
Show the bug title at the top of the form

Index: bugdisplay.html
===================================================================
RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- bugdisplay.html	17 Jun 2002 15:55:06 -0000	1.37
+++ bugdisplay.html	29 Jul 2002 12:07:23 -0000	1.38
@@ -55,7 +55,7 @@
     <input type="hidden" name="pos" value="{$smarty.request.pos}">
     <table border="0" width="100%">
 	<tr>
-	    <td>Bug <b>#{$bug_id}</b> - {$STRING.BUGDISPLAY.ReturnTo} <a href="query.php">{$STRING.BUGDISPLAY.BugList}</a></td>
+	    <td>Bug <b>#{$bug_id}</b> - {$title|stripslashes} - {$STRING.BUGDISPLAY.ReturnTo} <a href="query.php">{$STRING.BUGDISPLAY.BugList}</a></td>
 		<td align="right">
 {if $prevbug}
 		    <b><a href="bug.php?op=show&bugid={$prevbug}&pos={$prevpos}">{$STRING.previous_bug}</a></b>

[phpBT-dev] CVS: phpbt/languages de.php,1.14,1.15

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

Update of /cvsroot/phpbt/phpbt/languages
In directory usw-pr-cvs1:/tmp/cvs-serv12522/languages

Modified Files:
	de.php 
Log Message:
Updates by Mathias Leinmueller

Index: de.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/de.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- de.php	11 Apr 2002 15:25:13 -0000	1.14
+++ de.php	18 Jul 2002 13:10:53 -0000	1.15
@@ -2,6 +2,7 @@
 
 // strings-de.php - Deutsche Strings und Titel
 // Translation by Stefan Plank & Stefan Kunstmann
+// Translation by Mathias Leinmueller
 // ------------------------------------------------------------------------
 // Copyright (c) 2001 The phpBugTracker Group
 // ------------------------------------------------------------------------
@@ -25,7 +26,7 @@
 // -------------------------------------------------------------------------
 // $Id$
 
-$STRING = array(
+$STRING = array(	
 	'lang_charset' => 'iso8859-1',
 	'nouser' => 'Dieser Benutzer extistiert nicht',
 	'dupeofself' => 'Ein Bug kann kein Duplikat von sich selbst sein',
@@ -34,7 +35,7 @@
 	'givedesc' => 'Bitte geben Sie eine Beschreibung ein',
 	'noprojects' => 'Keine Projekte gefunden',
 	'totalbugs' => 'Bugs gesamt',
-	'giveemail' => 'Bitte geben Sie eine gültige E-mail Adresse ein.',
+	'giveemail' => 'Bitte geben Sie eine gültige E-Mail Adresse ein.',
 	'givelogin' => 'Bitte geben Sie einen Login an',
 	'loginused' => 'Dieser Benutzername ist bereits in Gebrauch',
 	'newacctsubject' => 'phpBugTracker Login',
@@ -49,7 +50,7 @@
 	'noversions' => 'Keine Version gefunden',
 	'nocomponents' => 'Keine Komponenten gefunden',
 	'nostatuses' => 'Keine Stati gefunden',
-	'noseverities' => 'Keine Schwierigkeitsgrade gefunden',
+	'noseverities' => 'Keine Schweregrade gefunden',
 	'givepassword' => 'Bitte geben Sie ein Passwort ein!',
 	'nousers' => 'Keinen Benutzer gefunden',
 	'bugbadperm' => 'Sie können diesen Bug nicht ändern',
@@ -73,15 +74,163 @@
 	'too_many_votes' => 'Die maximale Stimmzahl wurde bereits erreicht',
 	'no_votes' => 'Für diesen Bug existieren keine Stimmen',
 	'user_filter' => array(
-		0 => 'Alle User',
-		1 => 'Aktive User',
-		2 => 'Inaktive User'),
-	'dupe_dependency' => 'That bug dependency has already been added',
-	'image_path_not_writeable' => 'The subdirectory "jpgimages" is not writeable by the web process, so the summary image can not be rendered'
-	);
+		0 => 'Alle Benutzer',
+		1 => 'Aktive Benutzer',
+		2 => 'Inaktive Benutzer'
+	),
+	'dupe_dependency' => 'Diese Bugabhängigkeit wurde bereits hinzugefügt',
+	'image_path_not_writeable' => 'In das Unterverzeichnis "jpgimages" kann vom Web-Prozess aus nicht geschrieben werden. Damit kann keine Zusammenfassungsgrafik erzeugt werden.',
+	'password_changed' => 'Ihr Passwort wurde geändert',
+	'prefs_changed' => 'Ihre Optionen wurden geändert',
+	'databaselist' => 'Datenbankliste',
+	'database' => 'Datenbank',
+	'databases' => 'Datenbanken',
+	'name' => 'Name',
+	'description' => 'Beschreibung',
+	'sortorder' => 'Sortierreihenfolge',
+	'suredeletedb' => 'Sind sie sicher, dass sie diese Datenbank löschen wollen?',
+	'suredeletesite' => 'Sind sie sicher, dass sie diesen Standort löschen wollen?',
+	'delete' => 'Löschen',
+	'version' => 'Version',
+	'addnewsite' => 'Neuen Standort hinzufügen',
+	'sitelist' => 'Standortliste',
+	'sites' => 'Standorte',
+	'QUERY' => array(
+		'opt_All' => 'Alle',
+		'Project' => 'Projekt',
+		'Version' => 'Version',
+		'Component' => 'Komponente',
+		'Status' => 'Status',
+		'Resolution' => 'Lösung',
+		'OpSys' => 'OpSys',
+		'Priority' => 'Priorität',
+		'Severity' => 'Schweregrad',
+		'Database' => 'Datenbank',
+		'ReportedOnSite' => 'Berichtet auf Standort',
+		'Summary' => 'Zusammenfassung',
+		'DescriptionEntry' => 'Ein Beschreibungseintrag',
+		'SortBy' => 'Sortiere nach',
+		'SortBy_BugNumber' => 'Bug Nummmer',
+		'SortBy_Severity' => 'Schweregrad',
+		'SortBy_Reporter' => 'Berichterstatter',
+		'SortBy_Priority' => 'Priorität',
+		'SortBy_Status' => 'Status',
+		'SortAsc' => 'Aufsteigend',
+		'SortDesc' => 'Absteigend',
+		'SaveThisQueryAs' => 'Diese Anfrage speichern als',
+		'ResetBackToDefaultQuery' => 'Auf Standardabfrage zurücksetzen',
+		'SubmitQuery' => 'Abfrage absenden',
+		'SavedQueries' => 'Gespeicherte Abfragen',
+		'GoToThe' => 'Gehe zu der',
+		'AdvancedQueryPage' => 'Erweiterte Abfrageseite',
+		'SimpleQueryPage' => 'Einfache Abfrageseite',
+		'SureDeleteSavedQuery' => 'Sind sie sicher, dass sie diese gespeicherte Abfrage löschen wollen?',
+		'MatchingAs' => 'Übereinstimmung mit',
+		'MatchingAs_Regexp' => 'Regular Expression',
+		'MatchingAs_NotRegexp' => 'Keine Regular Expression',
+		'MatchingAs_Substring' => 'Teilzeichenfolge',
+		'MatchingAs_Exact' => 'Exakt',
+		'eMail_Reporter' => 'Berichterstatter',
+		'eMail_AssignedTo' => 'Zugewiesen an'
+	),
+	'WRAP' => array(
+		'FindBug' => 'Bug suchen',
+		'Home' => 'Home',
+		'AddNewBug' => 'Einen neuen Bug hinzufügen',
+		'QueryBugs' => 'Bugs abfragen',
+		'ViewReports' => 'Berichte anzeigen',
+		'Documentation' => 'Dokumentation lesen',
+		'AdminTools' => 'Adminwerkzeuge',
+		'CreateNewAccount' => 'Neuen Account anlegen'
+		),
+    'BUGFORM' => array(
+		'Project' => 'Projekt',
+		'Version' => 'Version',
+		'Summary' => 'Zusammenfassung',
+		'Description' => 'Beschreibung',
+		'Severity' => 'Schweregrad',
+		'Priority' => 'Priorität',
+		'Site' => 'Standort',
+		'Database' => 'Datenbank',
+		'Component' => 'Komponente',
+		'OS' => 'Betriebssystem',
+		'AddAnother' => 'Einen weiteren hinzufügen',
+		'Submit' => 'Absenden'
+	),
+	'BUGDISPLAY' => array(
+		'Reporter' => 'Berichterstatter',
+		'ReturnTo' => 'Zurück zu',
+		'BugList' => 'Bugliste',
+		'Project' => 'Projekt',
+		'Created' => 'Erzeugt',
+		'Version' => 'Version',
+		'ClosedInVersion' => 'Abgeschlossen in Version',
+		'ToBeClosedInVersion' => 'Abzuschließen in Version',
+		'AssignedTo' => 'Zugewiesen an',
+		'AssignedToNobody' => 'Niemand',
+		'BugDependency' => 'Abhängigkeiten',
+		'AddDependency' => 'Abhängigkeit hinzufügen',
+		'RemoveDependency' => 'Abhängigkeit entfernen',
+		'Summary' => 'Zusammenfassung',
+		'Status' => 'Status',
+		'Description' => 'Beschreibung',
+		'Severity' => 'Schweregrad',
+		'Priority' => 'Priorität',
+		'Component' => 'Komponente',
+		'Resolution' => 'Lösung',
+		'ResolutionNone' => 'Keine',
+		'AddCC' => 'CC hinzufügen',
+		'RemoveSelectedCC' => 'Gewählte CCs entfernen',
+		'AdditionalComments' => 'Zusätzliche Kommentare',
+		'Attachments' => 'Anhang',
+		'CreateAttachment' => 'Anhang erzeugen',
+		'SureDeleteAttachment' => 'Sind sie sicher, dass sie diesen Anhang löschen wollen?',
+		'Name' => 'Name',
+		'Size' => 'Größe',
+		'Type' => 'Typ',
+		'Created' => 'Erzeugt',
+		'VoteForThisBug' => 'Für diesen Bug stimmen',
+		'ViewVotes' => 'Stimmen anzeigen',
+		'ForThisBug' => 'für diesen Fehler',
+		'ViewBugActivity' => 'Bug-Aktivität anzeigen',
+		'PrintableView' => 'Druckansicht',
+		'NoAttachments' => 'Keine Anhänge',
+		'Comments' => 'Kommentare',
+		'PostedBy' => 'Eingetragen durch',
+		'Date' => 'Datum',
+		'DateOn' => 'Am',
+		'Submit' => 'Absenden',
+		'Site' => 'Berichtet an Standort',
+		'Database' => 'Datenbank',
+		'OS' => 'OS',
+		'ChooseOne' => 'Eines auswählen'
+	),
+	'USER_PREF' => array(
+		'ReceiveNotifications' => 'Änderungen an Bugs per E-Mail erhalten',
+		'ShowSavedQueries' => 'Gespeicherte Anfragen auf der Homepage anzeigen',
+		'ChangePassword' => 'Passwort ändern',
+		'EnterNewPassword' => 'Bitte geben sie unterhalb ihr neues Passwort zweimal ein',
+		'Password' => 'Passwort',
+		'Verify' => 'Bestätigen',
+		'ChangePreferences' => 'Einstellungen Ändern',
+		'BugListColumns' => 'Spalten der Bug-Liste',
+		'ChooseFields' => 'Wählen sie die Felder, die sie in der Bug-Liste sehen wollen',
+		'SureDeleteVote' => 'Sind sie sicher, dass sie diese Stimme löschen wollen?',
+		'Votes' => 'Stimmen',
+		'Bug' => 'Bug',
+		'When' => 'Sobald',
+		'ColumnPreferencesSaved' => 'Ihre Einstellugen für die Bug-Liste wurden gespeichert'	),
+	'INDEX' => array(
+		'FiveRecentlySubmitted' => 'Die fünf zuletzt gemeldeten Bugs',
+		'FiveRecentlyClosed' => 'Die fünf zuletzt abgeschlossenen Bugs',
+		'QuickStats' => 'Kurzstatistik',
+		'Status' => 'Status',
+		'NumberOfBugs' => '# Bugs',
+		'SavedQueries' => 'Gespeicherte Abfragen'
+		));
 
 // Page titles
-$TITLE = array(
+$TITLE = array(	
 	'enterbug' => 'Geben Sie einen Bug ein',
 	'editbug' => 'Bug Bearbeiten',
 	'newaccount' => 'Einen neuen Account anlegen',
@@ -93,15 +242,42 @@
 	'editproject' => 'Projekt bearbeiten',
 	'addversion' => 'Version hinzufügen',
 	'editversion' => 'Version bearbeiten',
+	'addsite' => 'Standort hinzufügen',
+	'editsite' => 'Standort bearbeiten',
 	'project' => 'Projekte',
 	'os' => 'Betriebssysteme',
 	'resolution' => 'Lösungen',
 	'status' => 'Stati',
-	'severity' => 'Schwierigkeitsgrad',
+	'severity' => 'Schweregrad',
 	'user' => 'Benutzer',
 	'home' => 'Home',
 	'reporting' => 'Bericht',
-	'group' => 'Gruppen'
-	);
+	'group' => 'Guppen',
+	'bugvotes' => 'Bug Abstimmung',
+	'bughistory' => 'Bug Historie',
+	'viewbug' => 'Bug ansehen',
+	'addattachment' => 'Anhang anfügen',
+	'accountcreated' => 'Account erzeugt',
+	'changessaved' => 'Änderungen gespeichert',
+	'preferences' => 'Benutzeroptionen',
+	'usertools' => 'Benutzerwerkzeuge',
+	'edituser' => 'Benutzer bearbeiten',
+	'adduser' => 'Benutzer hinzufügen',
+	'editstatus' => 'Status ändern',
+	'addstatus' => 'Status hinzufügen',
+	'editseverity' => 'Schweregrad ändern',
+	'addseverity' => 'Schweregrad hinzufügen',
+	'editresolution' => 'Lösung bearbeiten',
+	'addresolution' => 'Lösung hinzufügen',
+	'editos' => 'Betriebssystem bearbeiten',
+	'addos' => 'Betriebssystem hinzufügen',
+	'editgroup' => 'Gruppe bearbeiten',
+	'addgroup' => 'Gruppe hinzufügen',
+	'configuration' => 'Konfiguration',
+	'adddatabase' => 'Datenbank hinzufügen',
+	'editdatabase' => 'Datenbank bearbeiten',
+	'database' => 'Datenbanken',
+	'site' => 'Standorte'
+);	
 	
 ?>

[phpBT-dev] CVS: phpbt/inc functions.php,1.32,1.33

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

Update of /cvsroot/phpbt/phpbt/inc
In directory usw-pr-cvs1:/tmp/cvs-serv9963/inc

Modified Files:
	functions.php 
Log Message:
Added configuration constants for four types of bug statuses.  This removes the dependency on certain bug statuses having set names.

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- functions.php	13 Jun 2002 14:26:36 -0000	1.32
+++ functions.php	18 Jul 2002 13:02:15 -0000	1.33
@@ -48,75 +48,75 @@
     global $db, $select, $perm, $STRING, $restricted_projects, $QUERY;
 
     extract($params);
-    if (!isset($selected)) {
-	$selected = '';
-    }
+	if (!isset($selected)) {
+		$selected = '';
+	}
 	
     // create hash to map tablenames
-    $cfgDatabase = array(
-	'group' => TBL_AUTH_GROUP,
-	'project' => TBL_PROJECT,
-	'component' => TBL_COMPONENT,
-	'status' => TBL_STATUS,
-	'resolution' => TBL_RESOLUTION,
-	'severity' => TBL_SEVERITY,
-	'version' => TBL_VERSION,
-	'database' => TBL_DATABASE,
-	'site' => TBL_SITE
-    );
+	$cfgDatabase = array(
+		'group' => TBL_AUTH_GROUP,
+		'project' => TBL_PROJECT,
+		'component' => TBL_COMPONENT,
+		'status' => TBL_STATUS,
+		'resolution' => TBL_RESOLUTION,
+		'severity' => TBL_SEVERITY,
+		'version' => TBL_VERSION,
+		'database' => TBL_DATABASE,
+		'site' => TBL_SITE
+    	);
 
     $text = '';
 
     if (isset($cfgDatabase[$box])) {
-	$querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
-	$querymid = ' where sort_order > 0 order by sort_order';
-	$queries = array(
-	    'group' => $querystart.' where group_name <> \'User\' order by group_name',
-	    'severity' => $querystart.$querymid,
-	    'site' => $querystart.$querymid,
-	    'status' => $querystart.$querymid,
-	    'resolution' => $querystart.$querymid,
-	    'project' => $perm->have_perm('Admin')
-		? $querystart." where ".
-		    ($selected ? "(active > 0 or project_id in ($selected))" : 'active > 0').
-		    " order by {$box}_name"
-		: $querystart." where project_id not in ($restricted_projects)".
-		    " and ".
-		    ($selected ? " (active > 0 or project_id in ($selected))" : 'active > 0').
-		    " order by {$box}_name",
-	    'component' => $querystart." where project_id = $project and active = 1 order by {$box}_name",
-	    'version' => $querystart." where project_id = $project and active = 1 order by {$box}_id desc",
-	    'database' => "select {$box}_id, {$box}_name, {$box}_version from $cfgDatabase[$box]".$querymid
-	);
+		$querystart = "select {$box}_id, {$box}_name from $cfgDatabase[$box]";
+		$querymid = ' where sort_order > 0 order by sort_order';
+		$queries = array(
+	    	'group' => $querystart.' where group_name <> \'User\' order by group_name',
+	    	'severity' => $querystart.$querymid,
+	    	'site' => $querystart.$querymid,
+	    	'status' => $querystart.$querymid,
+	    	'resolution' => $querystart.$querymid,
+	    	'project' => $perm->have_perm('Admin')
+			? $querystart." where ".
+		    	($selected ? "(active > 0 or project_id in ($selected))" : 'active > 0').
+		    	" order by {$box}_name"
+			: $querystart." where project_id not in ($restricted_projects)".
+		    	" and ".
+		    	($selected ? " (active > 0 or project_id in ($selected))" : 'active > 0').
+		    	" order by {$box}_name",
+	    	'component' => $querystart." where project_id = $project and active = 1 order by {$box}_name",
+	    	'version' => $querystart." where project_id = $project and active = 1 order by {$box}_id desc",
+	    	'database' => "select {$box}_id, {$box}_name, {$box}_version from $cfgDatabase[$box]".$querymid
+			);
     }
     
     switch($box) {
 	case 'user_filter': 
 	    foreach ($STRING['user_filter'] as $k => $v) {
-		$text .= sprintf("<option value=\"%d\"%s>%s</option>",
-		$k, ($k == $selected ? ' selected' : ''), $v);
+			$text .= sprintf("<option value=\"%d\"%s>%s</option>",
+			$k, ($k == $selected ? ' selected' : ''), $v);
 	    }
-	break;
+		break;
 	case 'group':
 	    if ($project) { // If we are building for project admin page
-		if (!count($selected) or (count($selected) && in_array(0, $selected))) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text = "<option value=\"all\"$sel>All Groups</option>";
+			if (!count($selected) or (count($selected) && in_array(0, $selected))) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text = "<option value=\"all\"$sel>All Groups</option>";
 	    }
 	    $rs = $db->query($queries[$box]);
 	    while ($rs->fetchInto($row)) {
-		if (count($selected) && in_array($row[$box.'_id'], $selected)) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= '<option value="'.
-		$row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
+			if (count($selected) && in_array($row[$box.'_id'], $selected)) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= '<option value="'.
+			$row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
 	    }
-	break;
+		break;
 	case 'severity':
 	case 'status':
 	case 'resolution':
@@ -126,130 +126,145 @@
 	case 'version':
 	    $rs = $db->query($queries[$box]);
 	    while ($rs->fetchInto($row)) {
-		if ($selected == $row[$box.'_id'] and $selected != '') {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= '<option value="'.
-		$row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
+			if ($selected == $row[$box.'_id'] and $selected != '') {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= '<option value="'.
+			$row[$box.'_id']."\"$sel>".$row[$box.'_name'].'</option>';
 	    }
-	break;
+		break;
 	case 'database':
 	    $text = '<option value="0">None</option>';
 	    $rs = $db->query($queries[$box]);
 	    while ($rs->fetchInto($row)) {
-		if ($selected == $row[$box.'_id'] and $selected != '') {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= '<option value="'.
-		$row[$box.'_id'].'"'.$sel.'>'.$row[$box.'_name'].' '.$row[$box.'_version'].'</option>';
+			if ($selected == $row[$box.'_id'] and $selected != '') {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= '<option value="'.
+			$row[$box.'_id'].'"'.$sel.'>'.$row[$box.'_name'].' '.$row[$box.'_version'].'</option>';
 	    }
-	break;
+		break;
 	case 'os':
 	    $rs = $db->query("select {$box}_id, {$box}_name, regex from ".TBL_OS." where sort_order > 0 order by sort_order");
 	    while ($rs->fetchInto($row)) {
-		if ($selected == '' and isset($row['Regex']) and
-		    preg_match($row['Regex'],$GLOBALS['HTTP_USER_AGENT'])) {
-		    $sel = ' selected';
-		} elseif ($selected == $row[$box.'_id']) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= '<option value="'.$row[$box.'_id']."\"$sel>".$row[$box.'_name']."</option>";
+			if ($selected == '' and isset($row['Regex']) and
+		    	preg_match($row['Regex'],$GLOBALS['HTTP_USER_AGENT'])) {
+		    	$sel = ' selected';
+			} elseif ($selected == $row[$box.'_id']) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= '<option value="'.$row[$box.'_id']."\"$sel>".$row[$box.'_name']."</option>";
 	    }
-	break;
+		break;
 	case 'owner':
 	    $rs = $db->query("select u.user_id, login from ".TBL_AUTH_USER." u, ".TBL_USER_GROUP." ug, ".TBL_AUTH_GROUP." g where u.active > 0 and u.user_id = ug.user_id and ug.group_id = g.group_id and group_name = 'Developer' order by login");
 	    while ($rs->fetchInto($row)) {
-		if ($selected == $row['user_id']) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= "<option value=\"{$row['user_id']}\"$sel>{$row['login']}</option>";
+			if ($selected == $row['user_id']) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= "<option value=\"{$row['user_id']}\"$sel>{$row['login']}</option>";
 	    }
-	break;
+		break;
 	case 'bug_cc':
-	    $rs = $db->query(sprintf($QUERY['functions-bug-cc'], $selected));
-	    while (list($uid, $user) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
-		$text .= "<option value=\"$uid\">".maskemail($user).'</option>';
-	    }
-	    // Pad the sucker
-	    $text .= '<option value="" disabled>';
-	    for ($i = 0; $i < 30; $i++) {
-		$text .= '&nbsp;';
-	    }
-	    $text .= '</option>';
-	break;
+		$rs = $db->query(sprintf($QUERY['functions-bug-cc'], $selected));
+		while (list($uid, $user) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
+			$text .= "<option value=\"$uid\">".maskemail($user).'</option>';
+		}
+		// Pad the sucker
+		$text .= '<option value="" disabled>';
+		for ($i = 0; $i < 30; $i++) {
+			$text .= '&nbsp;';
+		}
+		$text .= '</option>';
+		break;
 	case 'LANGUAGE' :
 	    $dir = opendir('languages');
 	    while (false !== ($file = readdir($dir))) {
-		if ($file != '.' && $file != '..' && $file != 'CVS') {
-		    $filelist[] = str_replace('.php', '', $file);
-		}
+			if ($file != '.' && $file != '..' && $file != 'CVS') {
+		    	$filelist[] = str_replace('.php', '', $file);
+			}
 	    }
 	    closedir($dir);
 	    sort($filelist);
-	    foreach ($filelist as $file) {
-		if ($file == $selected) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= "<option value=\"$file\"$sel>$file</option>";
+	    	foreach ($filelist as $file) {
+			if ($file == $selected) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= "<option value=\"$file\"$sel>$file</option>";
 	    }
-	break;
+		break;
 	case 'THEME' :
 	    $dir = opendir('templates');
 	    while (false !== ($file = readdir($dir))) {
-		if ($file != '.' && $file != '..' && $file != 'CVS') {
-		    $filelist[] = str_replace('.php', '', $file);
-		}
+			if ($file != '.' && $file != '..' && $file != 'CVS') {
+		    	$filelist[] = str_replace('.php', '', $file);
+			}
 	    }
 	    closedir($dir);
 	    sort($filelist);
 	    foreach ($filelist as $file) {
-		if ($file == $selected) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= "<option value=\"$file\"$sel>$file</option>";
+			if ($file == $selected) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= "<option value=\"$file\"$sel>$file</option>";
 	    }
-	break;
+		break;
 	case 'STYLE' :
 	    $dir = opendir('styles');
 	    while (false !== ($file = readdir($dir))) {
-		if ($file != '.' && $file != '..' && $file != 'CVS') {
-		    $filelist[] = str_replace('.css', '', $file);
-		}
+			if ($file != '.' && $file != '..' && $file != 'CVS') {
+		    	$filelist[] = str_replace('.css', '', $file);
+			}
 	    }
 	    closedir($dir);
 	    sort($filelist);
 	    foreach ($filelist as $file) {
-		if ($file == $selected) {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
+			if ($file == $selected) {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= "<option value=\"$file\"$sel>$file</option>";
+	    }
+		break;
+	case 'BUG_UNCONFIRMED' :
+	case 'BUG_PROMOTED' :
+	case 'BUG_ASSIGNED' :
+	case 'BUG_REOPENED' :
+		static $bug_status_list = array();
+		
+		if (empty($bug_status_list)) {
+			$bug_status_list = $db->getAssoc("select status_id, status_name".
+				" from ".TBL_STATUS." order by status_name");
+		}
+		foreach ($bug_status_list as $id => $name) {
+			$sel = $id == $selected ? ' selected' : '';
+			$text .= "<option value=\"$id\"$sel>$name</option>";			
 		}
-		$text .= "<option value=\"$file\"$sel>$file</option>";
-	    }
-	break;
+		break;
 	default :
 	    $deadarray = $select[$box];
 	    while(list($val,$item) = each($deadarray)) {
-		if ($selected == $val and $selected != '') {
-		    $sel = ' selected';
-		} else {
-		    $sel = '';
-		}
-		$text .= "<option value=\"$val\"$sel>$item</option>";
+			if ($selected == $val and $selected != '') {
+		    	$sel = ' selected';
+			} else {
+		    	$sel = '';
+			}
+			$text .= "<option value=\"$val\"$sel>$item</option>";
 	    }
-	break;
+		break;
     }
     echo ($text);
 }

[phpBT-dev] CVS: phpbt/inc/db mysql.php,1.11,1.12 oci8.php,1.7,1.8 pgsql.php,1.16,1.17

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

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv9963/inc/db

Modified Files:
	mysql.php oci8.php pgsql.php 
Log Message:
Added configuration constants for four types of bug statuses.  This removes the dependency on certain bug statuses having set names.

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/mysql.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysql.php	25 Jun 2002 14:00:06 -0000	1.11
+++ mysql.php	18 Jul 2002 13:02:15 -0000	1.12
@@ -106,12 +106,14 @@
 		'where active = 1 and (pg.project_id is null or pg.group_id in (%s)) '.
 		'group by p.project_id, p.project_name '.
 		'order by project_name',
-	'include-template-owner' => "SELECT sum(CASE WHEN status_name in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) , ".
-		"sum(CASE WHEN status_name not in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) ".
+	'include-template-owner' => "SELECT sum(CASE WHEN s.status_id ".
+		"in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) , ".
+		"sum(CASE WHEN s.status_id ".
+		"not in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) ".
 		"from ".TBL_BUG." b left join ".TBL_STATUS." s using(status_id) ".
 		"where assigned_to = %s",
-	'include-template-reporter' => "SELECT sum(CASE WHEN status_name in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) , ".
-		"sum(CASE WHEN status_name not in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) ".
+	'include-template-reporter' => "SELECT sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) , ".
+		"sum(CASE WHEN s.status_id not in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) ".
 		"from ".TBL_BUG." b left join ".TBL_STATUS." s using(status_id) ".
 		"where created_by = %s",
 	'index-projsummary-1' => 'select project_name as "Project", '.

Index: oci8.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/oci8.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- oci8.php	25 Jun 2002 14:13:46 -0000	1.7
+++ oci8.php	18 Jul 2002 13:02:15 -0000	1.8
@@ -95,7 +95,7 @@
 		'owner.login as owner, r.resolution_name, st.status_name '.
 		'from '.TBL_BUG.' b, '.TBL_AUTH_USER.' owner, '.TBL_AUTH_USER.' reporter, '.
 		TBL_RESOLUTION.' r, '.TBL_SEVERITY.' sv, '.
-		TBL_STATUS.' st, '.TBL_SITE.' site '
+		TBL_STATUS.' st, '.TBL_SITE.' site '.
 		'where b.resolution_id = r.resolution_id(+) '.
 		'and b.assigned_to = owner.user_id(+) '.
 		'and b.created_by = reporter.user_id(+) '.
@@ -110,10 +110,12 @@
 		'where p.project_id = pg.project_id(+) and active = 1 '.
 		'and (pg.project_id is null or pg.group_id in (%s)) '.
 		'group by p.project_id, p.project_name order by project_name',
-	'include-template-owner' => "SELECT sum(decode( s.status_name, 'Unconfirmed', 1, 'New', 1, 'Assigned', 1, 'Reopened', 1, 0 )) ".
+	'include-template-owner' => "SELECT sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 1, ".BUG_PROMOTED.", 1, ".BUG_ASSIGNED.", 1, ".BUG_REOPENED.", 1, 0 )), ".
+		"sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 0, ".BUG_PROMOTED.", 0, ".BUG_ASSIGNED.", 0, ".BUG_REOPENED.", 0, 1 )), ".
 		'from '.TBL_BUG.' b, '.TBL_STATUS.' s '.
 		'where  b.status_id = s.status_id (+) and b.assigned_to = %s',
-	'include-template-reporter' => "SELECT sum(decode( s.status_name, 'Unconfirmed', 1, 'New', 1, 'Assigned', 1, 'Reopened', 1, 0 )) ".
+	'include-template-reporter' => "SELECT sum(decode( s.status_name, ".BUG_UNCONFIRMED.", 1, ".BUG_PROMOTED.", 1, ".BUG_ASSIGNED.", 1, ".BUG_REOPENED.", 1, 0 )), ".
+		"sum(decode( s.status_id, ".BUG_UNCONFIRMED.", 0, ".BUG_PROMOTED.", 0, ".BUG_ASSIGNED.", 0, ".BUG_REOPENED.", 0, 1 )), ".
 		'from '.TBL_BUG.' b, ' . TBL_STATUS.' s '.
 		'where  b.status_id = s.status_id (+) and b.created_by = %s',
 	'index-projsummary-1' => 'select b.project_id, p.project_name as "Project", '.

Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pgsql.php	8 Jul 2002 08:17:24 -0000	1.16
+++ pgsql.php	18 Jul 2002 13:02:15 -0000	1.17
@@ -106,12 +106,12 @@
 		'where active = 1 and (pg.project_id is null or pg.group_id in (%s)) '.
 		'group by p.project_id, p.project_name '.
 		'order by project_name',
-	'include-template-owner' => "SELECT sum(CASE WHEN status_name in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) , ".
-		"sum(CASE WHEN status_name not in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) ".
+	'include-template-owner' => "SELECT sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) , ".
+		"sum(CASE WHEN s.status_id not in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) ".
 		"from ".TBL_BUG." b left join ".TBL_STATUS." s using(status_id) ".
 		"where assigned_to = %s",
-	'include-template-reporter' => "SELECT sum(CASE WHEN status_name in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) , ".
-		"sum(CASE WHEN status_name not in ('Unconfirmed','New','Assigned','Reopened') THEN 1 ELSE 0 END ) ".
+	'include-template-reporter' => "SELECT sum(CASE WHEN s.status_id in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) , ".
+		"sum(CASE WHEN s.status_id not in (".OPEN_BUG_STATUSES.") THEN 1 ELSE 0 END ) ".
 		"from ".TBL_BUG." b left join ".TBL_STATUS." s using(status_id) ".
 		"where created_by = %s",
 	'index-projsummary-1' => 'select project_name as "Project", '.

[phpBT-dev] CVS: phpbt/schemas mysql.in,1.32,1.33 oci8.in,1.16,1.17 pgsql.in,1.33,1.34

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

Update of /cvsroot/phpbt/phpbt/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv9963/schemas

Modified Files:
	mysql.in oci8.in pgsql.in 
Log Message:
Added configuration constants for four types of bug statuses.  This removes the dependency on certain bug statuses having set names.

Index: mysql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/mysql.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mysql.in	18 Jun 2002 15:23:58 -0000	1.32
+++ mysql.in	18 Jul 2002 13:02:15 -0000	1.33
@@ -328,6 +328,10 @@
 INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
 INSERT INTO TBL_CONFIGURATION VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi');
 INSERT INTO TBL_CONFIGURATION VALUES ('SEND_MIME_EMAIL', '1', 'Whether to use MIME quoted-printable encoded emails or not', 'bool');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_UNCONFIRMED','1','The status to assign a bug when it is first submitted.','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_PROMOTED','2','The status to assign a bug when it is promoted (if enabled).','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_ASSIGNED','3','The status to assign a bug when it is assigned.','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_REOPENED','4','The status to assign a bug when it is reopened.','multi');
 
 INSERT INTO TBL_OS VALUES (1,'All',1,'');
 INSERT INTO TBL_OS VALUES (2,'Windows 3.1',2,'/Mozilla.*\\(Win16.*\\)/');

Index: oci8.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/oci8.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- oci8.in	18 Jun 2002 15:23:58 -0000	1.16
+++ oci8.in	18 Jul 2002 13:02:15 -0000	1.17
@@ -327,6 +327,10 @@
 INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
 INSERT INTO TBL_CONFIGURATION VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi');
 INSERT INTO TBL_CONFIGURATION VALUES ('SEND_MIME_EMAIL', '1', 'Whether to use MIME quoted-printable encoded emails or not', 'bool');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_UNCONFIRMED','1','The status to assign a bug when it is first submitted.','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_PROMOTED','2','The status to assign a bug when it is promoted (if enabled).','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_ASSIGNED','3','The status to assign a bug when it is assigned.','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_REOPENED','4','The status to assign a bug when it is reopened.','multi');
 
 INSERT INTO TBL_OS VALUES (1,'All',1,'');
 INSERT INTO TBL_OS VALUES (2,'Windows 3.1',2,'/Mozilla.*\\(Win16.*\\)/');

Index: pgsql.in
===================================================================
RCS file: /cvsroot/phpbt/phpbt/schemas/pgsql.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pgsql.in	18 Jun 2002 15:23:58 -0000	1.33
+++ pgsql.in	18 Jul 2002 13:02:15 -0000	1.34
@@ -324,6 +324,10 @@
 INSERT INTO TBL_CONFIGURATION VALUES ('LANGUAGE','en','The language file to use for warning and error messages','multi');
 INSERT INTO TBL_CONFIGURATION VALUES ('STYLE', 'default', 'The CSS file to use (color scheme)', 'multi');
 INSERT INTO TBL_CONFIGURATION VALUES ('SEND_MIME_EMAIL', '1', 'Whether to use MIME quoted-printable encoded emails or not', 'bool');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_UNCONFIRMED','1','The status to assign a bug when it is first submitted.','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_PROMOTED','2','The status to assign a bug when it is promoted (if enabled).','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_ASSIGNED','3','The status to assign a bug when it is assigned.','multi');
+INSERT INTO TBL_CONFIGURATION VALUES ('BUG_REOPENED','4','The status to assign a bug when it is reopened.','multi');
 
 INSERT INTO TBL_OS VALUES (1,'All',1,'');
 INSERT INTO TBL_OS VALUES (2,'Windows 3.1',2,'/Mozilla.*\\(Win16.*\\)/');

[phpBT-dev] CVS: phpbt bug.php,1.112,1.113 config-dist.php,1.18,1.19 config.php,1.32,1.33 include.php,1.120,1.121 query.php,1.82,1.83

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

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv9963

Modified Files:
	bug.php config-dist.php config.php include.php query.php 
Log Message:
Added configuration constants for four types of bug statuses.  This removes the dependency on certain bug statuses having set names.

Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- bug.php	17 Jun 2002 15:49:17 -0000	1.112
+++ bug.php	18 Jul 2002 13:02:12 -0000	1.113
@@ -68,7 +68,7 @@
 		// If a number of votes are required to promote a bug, check for promotion
 		if (!$bug_is_new and $db->getOne("select count(*) from ".
 			TBL_BUG_VOTE." where bug_id = $bug_id") == PROMOTE_VOTES) {
-			$status_id = $db->getOne("select status_id from ".TBL_STATUS." where status_name = 'New'");
+			$status_id = BUG_PROMOTED;
   		$buginfo = $db->getOne("select * from ".TBL_BUG." where bug_id = $bug_id");
 			$changedfields = array('status_id' => $status_id);
     	do_changedfields($u, $buginfo, $changedfields);
@@ -482,18 +482,11 @@
 
 	// Check to see if this bug's component has an owner and should be assigned
 	if ($owner = $db->getOne("select owner from ".TBL_COMPONENT." c where component_id = $component")) {
-	    $status = $db->getOne("select status_id from ".TBL_STATUS." where status_name = 'Assigned'");
+	    $status = BUG_ASSIGNED;
 	} else {
 	    $owner = 0;
-
-	    // If we aren't using voting to promote, then auto-promote to New
-	    if (PROMOTE_VOTES) {
-		$stat_to_assign = 'Unconfirmed';
-	    } else {
-		$stat_to_assign = 'New';
-	    }
-
-	    $status = $db->getOne("select status_id from ".TBL_STATUS." where status_name = '$stat_to_assign'");
+		// If we aren't using voting to promote, then auto-promote to New
+		$status = PROMOTE_VOTES ? BUG_UNCONFIRMED : BUG_PROMOTED;
 	}
 	
 	$db->query('insert into '.TBL_BUG.' (bug_id, title, description, url, '.

Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config-dist.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- config-dist.php	13 Jun 2002 11:29:39 -0000	1.18
+++ config-dist.php	18 Jul 2002 13:02:14 -0000	1.19
@@ -68,7 +68,6 @@
 
 define ('ONEDAY', 86400);
 
-require_once ('inc/db/'.DB_TYPE.'.php');
 require_once ('inc/auth.php');
 require_once ('inc/template.php');
 

Index: config.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/config.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- config.php	13 Jun 2002 11:29:39 -0000	1.32
+++ config.php	18 Jul 2002 13:02:14 -0000	1.33
@@ -70,7 +70,6 @@
 
 define ('ONEDAY', 86400);
 
-require_once ('inc/db/'.DB_TYPE.'.php');
 require_once ('inc/auth.php');
 require_once ('inc/template.php');
 

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- include.php	13 Jun 2002 14:26:34 -0000	1.120
+++ include.php	18 Jul 2002 13:02:14 -0000	1.121
@@ -58,7 +58,11 @@
 while (list($k, $v) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
   define($k, $v);
 }
+define('OPEN_BUG_STATUSES', join(', ', array(BUG_UNCONFIRMED, BUG_PROMOTED, 
+	BUG_ASSIGNED, BUG_REOPENED)));
 
+require_once ('inc/db/'.DB_TYPE.'.php');
+	
 // Localization - include the file with the desired language
 include 'languages/'.LANGUAGE.'.php';
 

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- query.php	17 Jun 2002 12:33:59 -0000	1.82
+++ query.php	18 Jul 2002 13:02:14 -0000	1.83
@@ -61,10 +61,8 @@
 	
 	// Open bugs assigned to the user -- a hit list
 	if ($assignedto || $reportedby) {
-		$status = $db->getCol("select status_id from ".TBL_STATUS.
-			" where status_name ".($open ? '' : 'not ').
-			"in ('Unconfirmed', 'New', 'Assigned', 'Reopened')");
-		$query[] = 'b.status_id in ('.delimit_list(',',$status).')';
+		$query[] = 'b.status_id '.($open ? '' : 'not ').
+			'in ('.OPEN_BUG_STATUSES.')';
 		if ($assignedto) {
 			$query[] = "assigned_to = {$_sv['uid']}";
 		} else {

Re: [phpBT-dev] 0.9.0

[Jirka P. <fi...@us...>]

> It seems like we are close to being ready for another release.  At
> least, it seems like the major features for the release are ready.
> Should we start planning on a release in the next week or two?  What's
> left to be done?

upgrade.php have to be changed.

Re: [phpBT-dev] 0.9.0

[Jirka P. <fi...@us...>]

> It seems like we are close to being ready for another release.  At
> least, it seems like the major features for the release are ready.
> Should we start planning on a release in the next week or two?  What's
> left to be done?

We have to do some bugfixes, maybe some translations and free form field.

[phpBT-dev] CVS: phpbt/inc/db pgsql.php,1.15,1.16

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv21686/phpbt/inc/db

Modified Files:
	pgsql.php 
Log Message:
Fix.


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pgsql.php	27 Jun 2002 16:16:25 -0000	1.15
+++ pgsql.php	8 Jul 2002 08:17:24 -0000	1.16
@@ -137,7 +137,7 @@
 		'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '.
 		'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '.
 		'left join '.TBL_VERSION.' version3 on b.closed_in_version_id = version3.version_id, '.
-		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.
+		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.TBL_SITE.' site, '.
 		TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.TBL_PROJECT.' project '.
 		'where b.severity_id = severity.severity_id '.
 		'and b.status_id = status.status_id and b.os_id = os.os_id '.

[phpBT-dev] 0.9.0

[Ben C. <php...@be...>]

It seems like we are close to being ready for another release.  At
least, it seems like the major features for the release are ready.
Should we start planning on a release in the next week or two?  What's
left to be done?

[phpBT-dev] CVS: phpbt/languages fr.php,1.11,1.12

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/languages
In directory usw-pr-cvs1:/tmp/cvs-serv26274/phpbt/languages

Modified Files:
	fr.php 
Log Message:
Translation by Aurelien Labrosse (knows as arcadien at sf.net). Let me know if you don't want your email address listed in this file.


Index: fr.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/fr.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fr.php	27 Jun 2002 13:50:29 -0000	1.11
+++ fr.php	27 Jun 2002 16:24:13 -0000	1.12
@@ -1,284 +1,283 @@
-<?php
-
-// fr.php - French strings and titles
-// Translation by Pierre Wargnier
-// ------------------------------------------------------------------------
-// Copyright (c) 2001 The phpBugTracker Group
-// ------------------------------------------------------------------------
-// This file is part of phpBugTracker
-//
-// phpBugTracker is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-// 
-// phpBugTracker is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with phpBugTracker; if not, write to the Free Software Foundation,
-// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-// ------------------------------------------------------------------------
-// $Id$
-
-$STRING = array(
-	'lang_charset' => 'iso8859-1',
-	'nouser' => 'Cet utilisateur n\'existe pas',
-	'dupeofself' => 'Un bogue ne peut pas être doublon de lui-même',
-	'nobug' => 'Ce bogue n\'existe pas',
-	'givesummary' => 'Veuillez saisir un résumé',
-	'givedesc' => 'Veuillez saisir une description',
-	'noprojects' => 'Pas de projet trouvé',
-	'totalbugs' => 'Total Bogues',
-	'giveemail' => 'Veuillez saisir une adresse électronique valide',
-	'givelogin' => 'Please enter a login',
-	'loginused' => 'Cet identifiant de connection est déjà utilisé',
-	'newacctsubject' => 'Identifiant de connection phpBugTracker',
-	'newacctmessage' => "Votre mot de passe phpBugTracker est %s",
-	'nobugs' => 'Pas de bogue trouvé',
-	'givename' => 'Veuillez saisir un nom',
-	'edit' => 'Editer',
-	'addnew' => 'Nouveau',
-	'nooses' => 'Pas d\'environement trouvé',
-	'giveinitversion' => 'Veuillez saisir une version initiale pour ce projet',
-	'giveversion' => 'Veuillez saisir une version',
-	'noversions' => 'Pas de version trouvée',
-	'nocomponents' => 'Pas de composant trouvé',
-	'nostatses' => 'Pas de statut trouvé',
-	'givepassword' => 'Veuillez saisir un mot de passe',
-	'nousers' => 'Pas d\'utilisateur trouvé',
-	'bugbadperm' => 'Vous ne pouvez pas modifier ce bogue',
-	'bugbadnum' => 'Ce bogue n\'existe pas',
-	'datecollision' => 'Ce bogue a été modifié depuis votre dernière lecture.	Il a été rechargé avec ses dernières modifications.',
-	'passwordmatch' => 'Les mots de passe ne correspondent pas -- veuillez re-essayer',
-	'nobughistory' => 'Il n\'y a pas d\'historique pour ce bogue',
-	'logintomodify' => 'Vous devez être connecté pour modifier ce bogue',
-	'dupe_attachment' => 'Ce fichier attaché existe déjà pour ce bogue',
-	'give_attachment' => 'Veuillez spécifier un fichier à envoyer',
-	'no_attachment_save_path'  => 'Imossible de savoir ou stocker le fichier!',
-	'attachment_path_not_writeable' => 'Impossible de créer un fichier dans le répertoire de sauvegarde',
-	'attachment_move_error' => 'Une erreur est survenue lors du déplacement du fichier envoyé',
-	'bad_attachment' => 'Ce fichier attaché n\'existe pas',
-	'attachment_too_large' => 'Le fichier envoyé dépasse la limite des '.number_format(ATTACHMENT_MAX_SIZE).' octets',
-	'bad_permission' => 'Vous n\'avez pas les droits pour réaliser cette action',
-	'noseverities' => 'Pas de criticités trouvées',
+<?php
+
+// fr.php - French strings and titles
+// Translation by Pierre Wargnier
+// Translation extended by Aurélien Labrosse <aur...@wa...>
+// ------------------------------------------------------------------------
+// Copyright (c) 2001 The phpBugTracker Group
+// ------------------------------------------------------------------------
+// This file is part of phpBugTracker
+//
+// phpBugTracker is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// phpBugTracker is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with phpBugTracker; if not, write to the Free Software Foundation,
+// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// ------------------------------------------------------------------------
+// $Id$
+
+$STRING = array(
+	'lang_charset' => 'iso8859-1',
+	'nouser' => 'Cet utilisateur n\'existe pas',
+	'dupeofself' => 'Un bogue ne peut pas être doublon de lui-même',
+	'nobug' => 'Ce bogue n\'existe pas',
+	'givesummary' => 'Veuillez saisir un résumé',
+	'givedesc' => 'Veuillez saisir une description',
+	'noprojects' => 'Pas de projet trouvé',
+	'totalbugs' => 'Total Bogues',
+	'giveemail' => 'Veuillez saisir une adresse électronique valide',
+	'givelogin' => 'Please enter a login',
+	'loginused' => 'Cet identifiant de connection est déjà utilisé',
+	'newacctsubject' => 'Identifiant de connection phpBugTracker',
+	'newacctmessage' => "Votre mot de passe phpBugTracker est %s",
+	'nobugs' => 'Pas de bogue trouvé',
+	'givename' => 'Veuillez saisir un nom',
+	'edit' => 'Editer',
+	'addnew' => 'Nouveau',
+	'nooses' => 'Pas d\'environement trouvé',
+	'giveinitversion' => 'Veuillez saisir une version initiale pour ce projet',
+	'giveversion' => 'Veuillez saisir une version',
+	'noversions' => 'Pas de version trouvée',
+	'nocomponents' => 'Pas de composant trouvé',
+	'nostatses' => 'Pas de statut trouvé',
+	'givepassword' => 'Veuillez saisir un mot de passe',
+	'nousers' => 'Pas d\'utilisateur trouvé',
+	'bugbadperm' => 'Vous ne pouvez pas modifier ce bogue',
+	'bugbadnum' => 'Ce bogue n\'existe pas',
+	'datecollision' => 'Ce bogue a été modifié depuis votre dernière lecture.	Il a été rechargé avec ses dernières modifications.',
+	'passwordmatch' => 'Les mots de passe ne correspondent pas -- veuillez re-essayer',
+	'nobughistory' => 'Il n\'y a pas d\'historique pour ce bogue',
+	'logintomodify' => 'Vous devez être connecté pour modifier ce bogue',
+	'dupe_attachment' => 'Ce fichier attaché existe déjà pour ce bogue',
+	'give_attachment' => 'Veuillez spécifier un fichier à envoyer',
+	'no_attachment_save_path'  => 'Imossible de savoir ou stocker le fichier!',
+	'attachment_path_not_writeable' => 'Impossible de créer un fichier dans le répertoire de sauvegarde',
+	'attachment_move_error' => 'Une erreur est survenue lors du déplacement du fichier envoyé',
+	'bad_attachment' => 'Ce fichier attaché n\'existe pas',
+	'attachment_too_large' => 'Le fichier envoyé dépasse la limite des '.number_format(ATTACHMENT_MAX_SIZE).' octets',
+	'bad_permission' => 'Vous n\'avez pas les droits pour réaliser cette action',
+	'noseverities' => 'Pas de criticités trouvées',
 
 // To be translated
-	'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen',
-	'previous_bug' => 'Previous',
-	'next_bug' => 'Next',
-	'already_voted' => 'You have already voted for this bug',
-	'too_many_votes' => 'You have reached the maximum number of votes per user',
-	'no_votes' => 'There are no votes for this bug',
+	'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen',
+	'previous_bug' => 'Précédent',
+	'next_bug' => 'Suivant',
+	'already_voted' => 'Vous avez déjà voté pour ce bug',
+	'too_many_votes' => 'Vous avez atteint le nombre de votes maximum par utilisateur',
+	'no_votes' => 'Il n\'y a pas de votes pour ce bogue',
 	'user_filter' => array(
-		0 => 'All users',
-		1 => 'Active users',
-		2 => 'Inactive users'),
-	'dupe_dependency' => 'That bug dependency has already been added',
-	'image_path_not_writeable' => 'The subdirectory "jpgimages" is not writeable by the web process, so the summary image can not be rendered',
-	'password_changed' => 'Your password has been changed',
-	'prefs_changed' => 'Your preferences have been changed',
-	'databaselist' => 'Database list',
-	'database' => 'Database',
-	'databases' => 'Databases',
-	'name' => 'Name',
+		0 => 'Tous les utilisateurs',
+		1 => 'Utilisateurs actifs',
+		2 => 'Utilisateurs inactifs'),
+	'dupe_dependency' => 'Cette dépendance entre bug à déjà été ajoutée',
+	'image_path_not_writeable' => 'Le processus du serveur web n\'a pas accès en écriture dans le repertoire "jpgimages", l`image ne peut &ecirc;tre affichée',
+	'password_changed' => 'Votre mot de passe à été modifié',
+	'prefs_changed' => 'Vos préférences ont été sauvegardées',
+	'databaselist' => 'Listes des bases de données',
+	'database' => 'Base de données',
+	'databases' => 'Bases de données',
+	'name' => 'Nom',
 	'description' => 'Description',
-	'sortorder' => 'Sort order',
-	'suredeletedb' => 'Are you sure to delete this database?',
-	'suredeletesite' => 'Are you sure to delete this site?',
-	'delete' => 'Delete',
+	'sortorder' => 'Ordre de tri',
+	'suredeletedb' => 'Etes vous certain de vouloir supprimer cette base de données?',
+	'suredeletesite' => 'Etes vous certain de vouloir supprimer ce site?',
+	'delete' => 'Effacer',
 	'version' => 'Version',
-	'addnewsite' => 'Add new Site',
-	'sitelist' => 'Site list',
+	'addnewsite' => 'Ajouter un nouveau site',
+	'sitelist' => 'Liste des sites',
 	'sites' => 'Sites',
 	'QUERY' => array(
-		'opt_All' => 'All',
-		'Project' => 'Project',
+		'opt_All' => 'Tout',
+		'Project' => 'Projets',
 		'Version' => 'Version',
-		'Component' => 'Component',
-		'Status' => 'Status',
+		'Component' => 'Composants',
+		'Status' => 'Etat',
 		'Resolution' => 'Resolution',
 		'OpSys' => 'OpSys',
-		'Priority' => 'Priority',
-		'Severity' => 'Severity',
-		'Database' => 'Database',
-		'ReportedOnSite' => 'Reported on Site',
-		'Summary' => 'Summary',
-		'DescriptionEntry' => 'A description entry',
-		'SortBy' => 'Sort By',
-		'SortBy_BugNumber' => 'Bug Number',
-		'SortBy_Severity' => 'Severity',
-		'SortBy_Reporter' => 'Reporter',
-		'SortBy_Priority' => 'Priority',
-		'SortBy_Status' => 'Status',
-		'SortAsc' => 'Ascending',
-		'SortDesc' => 'Descending',
-		'SaveThisQueryAs' => 'Save this query as',
-		'ResetBackToDefaultQuery' => 'Reset back to default query',
-		'SubmitQuery' => 'Submit query',
-		'SavedQueries' => 'Saved Queries',
-		'GoToThe' => 'Go to the',
-		'AdvancedQueryPage' => 'advanced query page',
-		'SimpleQueryPage' => 'simple query page',
-		'SureDeleteSavedQuery' => 'Are you sure you want to delete this saved query?',
+		'Priority' => 'Priorité',
+		'Severity' => 'Criticité',
+		'Database' => 'Base de données',
+		'ReportedOnSite' => 'Découvert sur le site',
+		'Summary' => 'Résumé',
+		'DescriptionEntry' => 'Description',
+		'SortBy' => 'Trier par',
+		'SortBy_BugNumber' => 'Numéro de bogue',
+		'SortBy_Severity' => 'Criticité',
+		'SortBy_Reporter' => 'Reporteur',
+		'SortBy_Priority' => 'Priorité',
+		'SortBy_Status' => 'Etat',
+		'SortAsc' => 'Croissant',
+		'SortDesc' => 'Decroissant',
+		'SaveThisQueryAs' => 'Sauvegarder la requète sous',
+		'ResetBackToDefaultQuery' => 'Réinitialiser avec la requète par défaut',
+		'SubmitQuery' => 'Envoyer la requète',
+		'SavedQueries' => 'Requètes sauvegardées',
+		'GoToThe' => 'Aller à',
+		'AdvancedQueryPage' => 'Requètes avancées',
+		'SimpleQueryPage' => 'Requètes simples',
+		'SureDeleteSavedQuery' => 'Etes vous certain de vouloir supprimer cette requète sauvegardée?',
 		'MatchingAs' => 'matching as',
-		'MatchingAs_Regexp' => 'regexp',
-		'MatchingAs_NotRegexp' => 'not regexp',
-		'MatchingAs_Substring' => 'substring',
-		'MatchingAs_Exact' => 'exact',
-		'eMail_Reporter' => 'Reporter',
-		'eMail_AssignedTo' => 'Assigned To'
+		'MatchingAs_Regexp' => 'expression rationnel',
+		'MatchingAs_NotRegexp' => 'non expression rationnelle',
+		'MatchingAs_Substring' => 'sous chaine',
+		'MatchingAs_Exact' => 'exactement',
+		'eMail_Reporter' => 'Reporteur',
+		'eMail_AssignedTo' => 'Assigné à'
 	),
 	'WRAP' => array(
-		'FindBug' => 'Find Bug',
-		'Home' => 'Home',
-		'AddNewBug' => 'Add a new Bug',
-		'QueryBugs' => 'Query Bugs',
-		'ViewReports' => 'View Reports',
-		'Documentation' => 'Read Documentation',
-		'AdminTools' => 'Admin Tools',
-		'CreateNewAccount' => 'Create a new Account'
+		'FindBug' => 'Chercher dans les bogues',
+		'Home' => 'Accueil',
+		'AddNewBug' => 'Ajouter un bogue',
+		'QueryBugs' => 'Chercher dans les bogues',
+		'ViewReports' => 'Voir un rapport',
+		'Documentation' => 'Lire la documentation',
+		'AdminTools' => 'Outils d\'administration',
+		'CreateNewAccount' => 'Créer un compte'
 	),
         'BUGFORM' => array(
-        	'Project' => 'Project',
+        	'Project' => 'Projet',
 		'Version' => 'Version',
-		'Summary' => 'Summary',
+		'Summary' => 'Résumé',
 		'Description' => 'Description',
-		'Severity' => 'Severity',
-		'Priority' => 'Priority',
+		'Severity' => 'Criticité',
+		'Priority' => 'Priorité',
 		'Site' => 'Site',
-		'Database' => 'Database',
-		'Component' => 'Component',
-		'OS' => 'OS',
-		'AddAnother' => 'Add another',
-		'Submit' => 'Submit'
+		'Database' => 'Base de données',
+		'Component' => 'Composants',
+		'OS' => 'Système d\'exploitation',
+		'AddAnother' => 'Ajouter encore',
+		'Submit' => 'Soumettre'
         ),
 	'BUGDISPLAY' => array(
-		'Reporter' => 'Reporter',
-		'ReturnTo' => 'Return to',
-		'BugList' => 'bug list',
-		'Project' => 'Project',
-		'Created' => 'Created',
+		'Reporter' => 'Reporteur',
+		'ReturnTo' => 'Retourner à',
+		'BugList' => 'Liste de bogue',
+		'Project' => 'Projet',
+		'Created' => 'Créé',
 		'Version' => 'Version',
-		'ClosedInVersion' => 'Closed in Version',
-		'ToBeClosedInVersion' => 'To be Closed in Version',
-		'AssignedTo' => 'Assigned To',
-		'AssignedToNobody' => 'Nobody',
-		'BugDependency' => 'Dependencies',
-		'AddDependency' => 'Add Dependency',
-		'RemoveDependency' => 'Remove Dependency',
-		'Summary' => 'Summary',
-		'Status' => 'Status',
+		'ClosedInVersion' => 'Clos en version',
+		'ToBeClosedInVersion' => 'A clore en version',
+		'AssignedTo' => 'Assigné à',
+		'AssignedToNobody' => 'Personne',
+		'BugDependency' => 'Dependances',
+		'AddDependency' => 'Ajouter une dépendance',
+		'RemoveDependency' => 'Supprimer la dépendance',
+		'Summary' => 'Résumé',
+		'Status' => 'Etat',
 		'Description' => 'Description',
-		'Severity' => 'Severity',
-		'Priority' => 'Priority',
-		'Component' => 'Component',
+		'Severity' => 'Criticité',
+		'Priority' => 'Priorité',
+		'Component' => 'Composant',
 		'Resolution' => 'Resolution',
-		'ResolutionNone' => 'None',
-		'AddCC' => 'Add CC',
-		'RemoveSelectedCC' => 'Remove selected CCs',
-		'AdditionalComments' => 'Additional Comments',
-		'Attachments' => 'Attachments',
-		'CreateAttachment' => 'Create Attachment',
-		'SureDeleteAttachment' => 'Are you sure you want to delete this attachment?',
-		'Name' => 'Name',
-		'Size' => 'Size',
+		'ResolutionNone' => 'Aucun',
+		'AddCC' => 'Ajouter un contact',
+		'RemoveSelectedCC' => 'Retirer le contact selectionné',
+		'AdditionalComments' => 'Commentaires complémentaires',
+		'Attachments' => 'Pièces jointes',
+		'CreateAttachment' => 'Ajouter une pièce jointe',
+		'SureDeleteAttachment' => 'Etes vous certain de vouloir supprimer cette pièce jointe?',
+		'Name' => 'Nom',
+		'Size' => 'Taille',
 		'Type' => 'Type',
-		'Created' => 'Created',
-		'VoteForThisBug' => 'Vote for this bug',
-		'ViewVotes' => 'View votes',
-		'ForThisBug' => 'for this bug',
-		'ViewBugActivity' => 'View bug activity',
-		'PrintableView' => 'Printable View',
-		'NoAttachments' => 'No attachments',
-		'Comments' => 'Comments',
-		'PostedBy' => 'Posted By',
+		'Created' => 'Créé',
+		'VoteForThisBug' => 'Votez pour ce bogue',
+		'ViewVotes' => 'Voir les votes',
+		'ForThisBug' => 'Votez pour ce bug',
+		'ViewBugActivity' => 'Voir l\'activité de ce bogue',
+		'PrintableView' => 'Vue imprimable',
+		'NoAttachments' => 'Pas de pièce jointe',
+		'Comments' => 'Commentaires',
+		'PostedBy' => 'Posté par',
 		'Date' => 'Date',
-		'DateOn' => 'On',
-		'Submit' => 'Submit',
-		'Site' => 'Reported on Site',
-		'Database' => 'Database',
-		'OS' => 'OS',
-		'ChooseOne' => 'Choose One'
+		'DateOn' => 'Sur',
+		'Submit' => 'Soumettre',
+		'Site' => 'Découvert sur le site',
+		'Database' => 'Base de données',
+		'OS' => 'Système d\'exploitation',
+		'ChooseOne' => 'Choisissez'
 	),
 	'USER_PREF' => array(
-		'ReceiveNotifications' => 'Receive notifications of bug changes via email',
-		'ShowSavedQueries' => 'Show saved queries on the homepage',
-		'ChangePassword' => 'Change password',
-		'EnterNewPassword' => 'Please enter your new password twice below',
-		'Password' => 'Password',
-		'Verify' => 'Verify',
+		'ReceiveNotifications' => 'Recevoir les mises à jour de bogue par email',
+		'ShowSavedQueries' => 'Montrer ls requètes sauvegardées sur la page personnelle',
+		'ChangePassword' => 'Changer de mot de passe',
+		'EnterNewPassword' => 'Saisissez deux fois votre mot de passe ci-dessous',
+		'Password' => 'Mot de passe',
+		'Verify' => 'Verification',
 		'ChangePreferences' => 'ChangePreferences',
-		'BugListColumns' => 'Bug List Columns',
-		'ChooseFields' => 'Choose the fields you want to see in the bug list',
-		'SureDeleteVote' => 'Are you sure you want to delete this vote?',
+		'BugListColumns' => 'Colonnes de liste de bogue',
+		'ChooseFields' => 'Choisissez les champs que vous voulez dans la liste de bogue',
+		'SureDeleteVote' => 'Etes vous certain de vouloir supprimer ce vote?',
 		'Votes' => 'Votes',
-		'Bug' => 'Bug',
-		'When' => 'When',
-		'ColumnPreferencesSaved' => 'Your bug list column preferences have been saved'
+		'Bug' => 'Bogue',
+		'When' => 'Quand',
+		'ColumnPreferencesSaved' => 'Vos préférences de colonnes de liste de bogue ont été enregistrées.'
 	),
 	'INDEX' => array(
-		'FiveRecentlySubmitted' => 'Five most recently submitted bugs',
-		'FiveRecentlyClosed' => 'Five most recently closed bugs',
-		'QuickStats' => 'Quick stats',
-		'Status' => 'Status',
-		'NumberOfBugs' => '# bugs',
-		'SavedQueries' => 'Saved Queries'
+		'FiveRecentlySubmitted' => 'Les cinq derniers bogues découverts',
+		'FiveRecentlyClosed' => 'Les cinq plus récent bugs clos',
+		'QuickStats' => 'Statistiques',
+		'Status' => 'Etat',
+		'NumberOfBugs' => '# bogues',
+		'SavedQueries' => 'Requètes pré-enregistrées'
 	)
     );
-	
-// Page titles
-$TITLE = array(
-	'enterbug' => 'Saisir un bogue',
-	'editbug' => 'Editer un bogue',
-	'newaccount' => 'Créer un nouveau compte',
-	'bugquery' => 'Recherche de bogues',
-	'buglist' => 'Liste de bogues',
-	'addcomponent' => 'Ajouter un composant',
-	'editcomponent' => 'Editer un composant',
-	'addproject' => 'Ajouter un projet',
-	'editproject' => 'Editer un projet',
-	'addversion' => 'Ajouter une version',
-	'editversion' => 'Editer une version',
-	'project' => 'Projets',
-	'os' => 'Environements',
-	'resolution' => 'Resolutions',
-	'status' => 'Statuts',
-	'user' => 'Utilisateurs',
-	'home' => 'Sommaire',
-	'reporting' => 'Tableaux de bord',
-	'severity' => 'Criticité',
-	'group' => 'Groups'
-
-// To be translated
-	'addsite' => 'Add Site',
-	'editsite' => 'Edit Site',
-	'bugvotes' => 'Bug Votes',
-	'bughistory' => 'Bug History',
-	'viewbug' => 'View Bug',
-	'addattachment' => 'Add Attachment',
-	'accountcreated' => 'Account Created',
-	'changessaved' => 'Changes Saved',
-	'preferences' => 'User Preferences',
-	'usertools' => 'User Tools',
-	'edituser' => 'Edit User',
-	'adduser' => 'Add User',
-	'editstatus' => 'Edit Status',
-	'addstatus' => 'Add Status',
-	'editseverity' => 'Edit Severity',
-	'addseverity' => 'Add Severity',
-	'editresolution' => 'Edit Resolution',
-	'addresolution' => 'Add Resolution',
-	'editos' => 'Edit Operating System',
-	'addos' => 'Add Operating System',
-	'editgroup' => 'Edit Group',
-	'addgroup' => 'Add Group',
+	
+// Page titles
+$TITLE = array(
+	'enterbug' => 'Saisir un bogue',
+	'editbug' => 'Editer un bogue',
+	'newaccount' => 'Créer un nouveau compte',
+	'bugquery' => 'Recherche de bogues',
+	'buglist' => 'Liste de bogues',
+	'addcomponent' => 'Ajouter un composant',
+	'editcomponent' => 'Editer un composant',
+	'addproject' => 'Ajouter un projet',
+	'editproject' => 'Editer un projet',
+	'addversion' => 'Ajouter une version',
+	'editversion' => 'Editer une version',
+	'project' => 'Projets',
+	'os' => 'Environements',
+	'resolution' => 'Resolutions',
+	'status' => 'Statuts',
+	'user' => 'Utilisateurs',
+	'home' => 'Sommaire',
+	'reporting' => 'Tableaux de bord',
+	'severity' => 'Criticité',
+	'group' => 'Groups',
+	'addsite' => 'Ajouter un site',
+	'editsite' => 'Editer un site',
+	'bugvotes' => 'Votes pour ce bogue',
+	'bughistory' => 'Historique de ce bogue',
+	'viewbug' => 'Voir ce bogue',
+	'addattachment' => 'Ajouter une pièce jointe',
+	'accountcreated' => 'Compte créé',
+	'changessaved' => 'Les modifications ont été enregistrées',
+	'preferences' => 'Préférences utilisateur',
+	'usertools' => 'Outils utilisateur',
+	'edituser' => 'Editer un utilisateur',
+	'adduser' => 'Ajouter un utilisateur',
+	'editstatus' => 'Editer l\état',
+	'addstatus' => 'Ajouter un état',
+	'editseverity' => 'Editer la criticité',
+	'addseverity' => 'Ajouter une criticité',
+	'editresolution' => 'Editer une résolution',
+	'addresolution' => 'Ajouter une résolution',
+	'editos' => 'Editer le système d\'exploitation',
+	'addos' => 'Ajouter un système d\'exploitation',
+	'editgroup' => 'Editer le groupe',
+	'addgroup' => 'Ajouter un groupe',
 	'configuration' => 'Configuration',
-	'adddatabase' => 'Add Database',
-	'editdatabase' => 'Edit Database',
-	'database' => 'Databases',
+	'adddatabase' => 'Ajouter une base de données',
+	'editdatabase' => 'Editer une base de données',
+	'database' => 'Bases de données',
 	'site' => 'Sites'
-    );

-?>
+    );
+?>

[phpBT-dev] CVS: phpbt/inc/db pgsql.php,1.14,1.15

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv24053/phpbt/inc/db

Modified Files:
	pgsql.php 
Log Message:
Empty spaces, what are we living for ...


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pgsql.php	26 Jun 2002 16:15:38 -0000	1.14
+++ pgsql.php	27 Jun 2002 16:16:25 -0000	1.15
@@ -79,7 +79,7 @@
 		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id, '.
 		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.
 		TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.
-		TBL_PROJECT.' project, '.TBL_SITE.' site'.
+		TBL_PROJECT.' project, '.TBL_SITE.' site '.
 		'where b.severity_id = severity.severity_id '.
 		'and b.status_id = status.status_id and b.os_id = os.os_id '.
 		'and b.version_id = version.version_id '.

[phpBT-dev] CVS: phpbt/languages pt-br.php,1.15,1.16

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/languages
In directory usw-pr-cvs1:/tmp/cvs-serv10893/phpbt/languages

Modified Files:
	pt-br.php 
Log Message:
Fix.


Index: pt-br.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/pt-br.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pt-br.php	25 Jun 2002 14:34:19 -0000	1.15
+++ pt-br.php	27 Jun 2002 13:50:53 -0000	1.16
@@ -283,4 +283,3 @@
 );
 	
 ?>
-

[phpBT-dev] CVS: phpbt/languages fr.php,1.10,1.11

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/languages
In directory usw-pr-cvs1:/tmp/cvs-serv10595/phpbt/languages

Modified Files:
	fr.php 
Log Message:
Prepared for Aurelien Labrosse. Waiting for translation.


Index: fr.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/languages/fr.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fr.php	26 Mar 2002 17:12:29 -0000	1.10
+++ fr.php	27 Jun 2002 13:50:29 -0000	1.11
@@ -64,19 +64,170 @@
 	'attachment_too_large' => 'Le fichier envoyé dépasse la limite des '.number_format(ATTACHMENT_MAX_SIZE).' octets',
 	'bad_permission' => 'Vous n\'avez pas les droits pour réaliser cette action',
 	'noseverities' => 'Pas de criticités trouvées',
+
+// To be translated
 	'project_only_all_groups' => 'You cannot choose specific groups when "All Groups" is chosen',
 	'previous_bug' => 'Previous',
 	'next_bug' => 'Next',
-	'already_voted' => 'You have already voted for this bug',
-	'too_many_votes' => 'You have reached the maximum number of votes per user',
-	'no_votes' => 'There are no votes for this bug',
-	'user_filter' => array(
-		0 => 'All users',
-		1 => 'Active users',
-		2 => 'Inactive users'),
-	'dupe_dependency' => 'That bug dependency has already been added',
-	'image_path_not_writeable' => 'The subdirectory "jpgimages" is not writeable by the web process, so the summary image can not be rendered'
-	);
+	'already_voted' => 'You have already voted for this bug',
+	'too_many_votes' => 'You have reached the maximum number of votes per user',
+	'no_votes' => 'There are no votes for this bug',
+	'user_filter' => array(
+		0 => 'All users',
+		1 => 'Active users',
+		2 => 'Inactive users'),
+	'dupe_dependency' => 'That bug dependency has already been added',
+	'image_path_not_writeable' => 'The subdirectory "jpgimages" is not writeable by the web process, so the summary image can not be rendered',
+	'password_changed' => 'Your password has been changed',
+	'prefs_changed' => 'Your preferences have been changed',
+	'databaselist' => 'Database list',
+	'database' => 'Database',
+	'databases' => 'Databases',
+	'name' => 'Name',
+	'description' => 'Description',
+	'sortorder' => 'Sort order',
+	'suredeletedb' => 'Are you sure to delete this database?',
+	'suredeletesite' => 'Are you sure to delete this site?',
+	'delete' => 'Delete',
+	'version' => 'Version',
+	'addnewsite' => 'Add new Site',
+	'sitelist' => 'Site list',
+	'sites' => 'Sites',
+	'QUERY' => array(
+		'opt_All' => 'All',
+		'Project' => 'Project',
+		'Version' => 'Version',
+		'Component' => 'Component',
+		'Status' => 'Status',
+		'Resolution' => 'Resolution',
+		'OpSys' => 'OpSys',
+		'Priority' => 'Priority',
+		'Severity' => 'Severity',
+		'Database' => 'Database',
+		'ReportedOnSite' => 'Reported on Site',
+		'Summary' => 'Summary',
+		'DescriptionEntry' => 'A description entry',
+		'SortBy' => 'Sort By',
+		'SortBy_BugNumber' => 'Bug Number',
+		'SortBy_Severity' => 'Severity',
+		'SortBy_Reporter' => 'Reporter',
+		'SortBy_Priority' => 'Priority',
+		'SortBy_Status' => 'Status',
+		'SortAsc' => 'Ascending',
+		'SortDesc' => 'Descending',
+		'SaveThisQueryAs' => 'Save this query as',
+		'ResetBackToDefaultQuery' => 'Reset back to default query',
+		'SubmitQuery' => 'Submit query',
+		'SavedQueries' => 'Saved Queries',
+		'GoToThe' => 'Go to the',
+		'AdvancedQueryPage' => 'advanced query page',
+		'SimpleQueryPage' => 'simple query page',
+		'SureDeleteSavedQuery' => 'Are you sure you want to delete this saved query?',
+		'MatchingAs' => 'matching as',
+		'MatchingAs_Regexp' => 'regexp',
+		'MatchingAs_NotRegexp' => 'not regexp',
+		'MatchingAs_Substring' => 'substring',
+		'MatchingAs_Exact' => 'exact',
+		'eMail_Reporter' => 'Reporter',
+		'eMail_AssignedTo' => 'Assigned To'
+	),
+	'WRAP' => array(
+		'FindBug' => 'Find Bug',
+		'Home' => 'Home',
+		'AddNewBug' => 'Add a new Bug',
+		'QueryBugs' => 'Query Bugs',
+		'ViewReports' => 'View Reports',
+		'Documentation' => 'Read Documentation',
+		'AdminTools' => 'Admin Tools',
+		'CreateNewAccount' => 'Create a new Account'
+	),
+        'BUGFORM' => array(
+        	'Project' => 'Project',
+		'Version' => 'Version',
+		'Summary' => 'Summary',
+		'Description' => 'Description',
+		'Severity' => 'Severity',
+		'Priority' => 'Priority',
+		'Site' => 'Site',
+		'Database' => 'Database',
+		'Component' => 'Component',
+		'OS' => 'OS',
+		'AddAnother' => 'Add another',
+		'Submit' => 'Submit'
+        ),
+	'BUGDISPLAY' => array(
+		'Reporter' => 'Reporter',
+		'ReturnTo' => 'Return to',
+		'BugList' => 'bug list',
+		'Project' => 'Project',
+		'Created' => 'Created',
+		'Version' => 'Version',
+		'ClosedInVersion' => 'Closed in Version',
+		'ToBeClosedInVersion' => 'To be Closed in Version',
+		'AssignedTo' => 'Assigned To',
+		'AssignedToNobody' => 'Nobody',
+		'BugDependency' => 'Dependencies',
+		'AddDependency' => 'Add Dependency',
+		'RemoveDependency' => 'Remove Dependency',
+		'Summary' => 'Summary',
+		'Status' => 'Status',
+		'Description' => 'Description',
+		'Severity' => 'Severity',
+		'Priority' => 'Priority',
+		'Component' => 'Component',
+		'Resolution' => 'Resolution',
+		'ResolutionNone' => 'None',
+		'AddCC' => 'Add CC',
+		'RemoveSelectedCC' => 'Remove selected CCs',
+		'AdditionalComments' => 'Additional Comments',
+		'Attachments' => 'Attachments',
+		'CreateAttachment' => 'Create Attachment',
+		'SureDeleteAttachment' => 'Are you sure you want to delete this attachment?',
+		'Name' => 'Name',
+		'Size' => 'Size',
+		'Type' => 'Type',
+		'Created' => 'Created',
+		'VoteForThisBug' => 'Vote for this bug',
+		'ViewVotes' => 'View votes',
+		'ForThisBug' => 'for this bug',
+		'ViewBugActivity' => 'View bug activity',
+		'PrintableView' => 'Printable View',
+		'NoAttachments' => 'No attachments',
+		'Comments' => 'Comments',
+		'PostedBy' => 'Posted By',
+		'Date' => 'Date',
+		'DateOn' => 'On',
+		'Submit' => 'Submit',
+		'Site' => 'Reported on Site',
+		'Database' => 'Database',
+		'OS' => 'OS',
+		'ChooseOne' => 'Choose One'
+	),
+	'USER_PREF' => array(
+		'ReceiveNotifications' => 'Receive notifications of bug changes via email',
+		'ShowSavedQueries' => 'Show saved queries on the homepage',
+		'ChangePassword' => 'Change password',
+		'EnterNewPassword' => 'Please enter your new password twice below',
+		'Password' => 'Password',
+		'Verify' => 'Verify',
+		'ChangePreferences' => 'ChangePreferences',
+		'BugListColumns' => 'Bug List Columns',
+		'ChooseFields' => 'Choose the fields you want to see in the bug list',
+		'SureDeleteVote' => 'Are you sure you want to delete this vote?',
+		'Votes' => 'Votes',
+		'Bug' => 'Bug',
+		'When' => 'When',
+		'ColumnPreferencesSaved' => 'Your bug list column preferences have been saved'
+	),
+	'INDEX' => array(
+		'FiveRecentlySubmitted' => 'Five most recently submitted bugs',
+		'FiveRecentlyClosed' => 'Five most recently closed bugs',
+		'QuickStats' => 'Quick stats',
+		'Status' => 'Status',
+		'NumberOfBugs' => '# bugs',
+		'SavedQueries' => 'Saved Queries'
+	)
+    );
 	
 // Page titles
 $TITLE = array(
@@ -100,6 +251,34 @@
 	'reporting' => 'Tableaux de bord',
 	'severity' => 'Criticité',
 	'group' => 'Groups'
-	);
-	
+
+// To be translated
+	'addsite' => 'Add Site',
+	'editsite' => 'Edit Site',
+	'bugvotes' => 'Bug Votes',
+	'bughistory' => 'Bug History',
+	'viewbug' => 'View Bug',
+	'addattachment' => 'Add Attachment',
+	'accountcreated' => 'Account Created',
+	'changessaved' => 'Changes Saved',
+	'preferences' => 'User Preferences',
+	'usertools' => 'User Tools',
+	'edituser' => 'Edit User',
+	'adduser' => 'Add User',
+	'editstatus' => 'Edit Status',
+	'addstatus' => 'Add Status',
+	'editseverity' => 'Edit Severity',
+	'addseverity' => 'Add Severity',
+	'editresolution' => 'Edit Resolution',
+	'addresolution' => 'Add Resolution',
+	'editos' => 'Edit Operating System',
+	'addos' => 'Add Operating System',
+	'editgroup' => 'Edit Group',
+	'addgroup' => 'Add Group',
+	'configuration' => 'Configuration',
+	'adddatabase' => 'Add Database',
+	'editdatabase' => 'Edit Database',
+	'database' => 'Databases',
+	'site' => 'Sites'
+    );

 ?>

[phpBT-dev] CVS: phpbt/inc/db pgsql.php,1.13,1.14

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv26235/phpbt/inc/db

Modified Files:
	pgsql.php 
Log Message:
Is this the final fix?


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pgsql.php	26 Jun 2002 13:49:34 -0000	1.13
+++ pgsql.php	26 Jun 2002 16:15:38 -0000	1.14
@@ -136,7 +136,7 @@
 		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '.
 		'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '.
 		'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '.
-		'left join '.TBL_VERSION.' version3 on b.closed_id_version_id = version3.version_id, '.
+		'left join '.TBL_VERSION.' version3 on b.closed_in_version_id = version3.version_id, '.
 		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.
 		TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.TBL_PROJECT.' project '.
 		'where b.severity_id = severity.severity_id '.

[phpBT-dev] CVS: phpbt/inc/db pgsql.php,1.12,1.13

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv10850/phpbt/inc/db

Modified Files:
	pgsql.php 
Log Message:
Database independency nightmare bugfix. Not tested.


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pgsql.php	26 Jun 2002 12:30:43 -0000	1.12
+++ pgsql.php	26 Jun 2002 13:49:34 -0000	1.13
@@ -135,8 +135,8 @@
 		'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '.
 		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '.
 		'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '.
-		'left join '.TBL_VERSION.' on version2 b.to_be_closed_in_version_id = version2.version_id '.
-		'left join '.TBL_VERSION.' on version3 b.closed_id_version_id = version3.version_id, '.
+		'left join '.TBL_VERSION.' version2 on b.to_be_closed_in_version_id = version2.version_id '.
+		'left join '.TBL_VERSION.' version3 on b.closed_id_version_id = version3.version_id, '.
 		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.
 		TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.TBL_PROJECT.' project '.
 		'where b.severity_id = severity.severity_id '.

[phpBT-dev] CVS: phpbt/inc/db pgsql.php,1.11,1.12

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv16271/phpbt/inc/db

Modified Files:
	pgsql.php 
Log Message:
Maybe I haven't forgotten a comma (,) somewhere. Bugfix for bug #573061. Let me know ...


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgsql.php	26 Jun 2002 09:56:53 -0000	1.11
+++ pgsql.php	26 Jun 2002 12:30:43 -0000	1.12
@@ -133,7 +133,7 @@
 		'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '.
 		'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '.
 		'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '.
-		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_i, '.
+		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id '.
 		'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '.
 		'left join '.TBL_VERSION.' on version2 b.to_be_closed_in_version_id = version2.version_id '.
 		'left join '.TBL_VERSION.' on version3 b.closed_id_version_id = version3.version_id, '.

[phpBT-dev] CVS: phpbt/inc/db pgsql.php,1.10,1.11

[Jirka P. <fi...@us...>]

Update of /cvsroot/phpbt/phpbt/inc/db
In directory usw-pr-cvs1:/tmp/cvs-serv1111/phpbt/inc/db

Modified Files:
	pgsql.php 
Log Message:
Fixed bugfix. :-)


Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/db/pgsql.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pgsql.php	26 Jun 2002 09:36:27 -0000	1.10
+++ pgsql.php	26 Jun 2002 09:56:53 -0000	1.11
@@ -75,7 +75,7 @@
 		'from '.TBL_BUG.' b '.
 		'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '.
 		'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '.
-		'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id, '.
+		'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '.
 		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id, '.
 		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.
 		TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.
@@ -133,9 +133,9 @@
 		'left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id '.
 		'left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '.
 		'left join '.TBL_AUTH_USER.' lastmodifier on b.last_modified_by = lastmodifier.user_id '.
-		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_id, '.
-		'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id, '.
-		'left join '.TBL_VERSION.' on version2 b.to_be_closed_in_version_id = version2.version_id, '.
+		'left join '.TBL_RESOLUTION.' resolution on b.resolution_id = resolution.resolution_i, '.
+		'left join '.TBL_DATABASE.' on b.database_id = '.TBL_DATABASE.'.database_id '.
+		'left join '.TBL_VERSION.' on version2 b.to_be_closed_in_version_id = version2.version_id '.
 		'left join '.TBL_VERSION.' on version3 b.closed_id_version_id = version3.version_id, '.
 		TBL_SEVERITY.' severity, '.TBL_STATUS.' status, '.TBL_OS.' os, '.
 		TBL_VERSION.' version, '.TBL_COMPONENT.' component, '.TBL_PROJECT.' project '.