From 58b822c80635ffb7c691c44bbcf8d8990a88b18a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 7 Jul 2008 20:02:52 +0000
Subject: [PATCH] New: Add timezone

---
 htdocs/admin/system/dolibarr.php | 6 +++++-
 htdocs/langs/en_US/admin.lang    | 2 ++
 htdocs/langs/fr_FR/admin.lang    | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 016a7022f21..c7d3eba38f6 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -61,9 +61,13 @@ print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("LanguageParameter","
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("LanguageParameter","PHP LC_MONETARY")."</td><td>".setlocale(LC_MONETARY,0)."</td></tr>\n";
 $var=!$var;
-print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("ServerTZ")."</td><td>".$_ENV["TZ"]."</td></tr>\n";
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("PHPTZ")." (date.timezone)</td><td>".ini_get("date.timezone")."</td></tr>\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+$var=!$var;
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("ServerTZ")." (TZ)</td><td>".$_ENV["TZ"]."</td></tr>\n";
 $var=!$var;
 print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("PHPServerOffsetWithGreenwich")."</td><td>".(- dolibarr_mktime(0,0,0,1,1,1970))."</td></tr>\n";
+$var=!$var;
+print "<tr ".$bc[$var]."><td width=\"300\">".$langs->trans("CurrentHour")."</td><td>".dolibarr_print_date(time(),'dayhour')."</td></tr>\n";
 print '</table>';
 print '<br>';
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c1410ca1ed8..1e6fe1ff759 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -72,7 +72,9 @@ LocalisationDolibarrParameters=Localisation parameters
 CurrentDolibarrLanguage=Dolibarr current language
 DolibarrTZ=Time Zone
 ServerTZ=Server Time Zone
+PHPTZ=PHP Time Zone
 PHPServerOffsetWithGreenwich=Server PHP Offset width Greenwich (secondes)
+CurrentHour=Current hour
 OSEnv=OS Environment
 Box=Box
 Boxes=Boxes
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 12861638b9d..05bdaca319e 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -72,7 +72,9 @@ LocalisationDolibarrParameters=Param
 CurrentDolibarrLanguage=Langue Dolibarr courante
 DolibarrTZ=Time Zone
 ServerTZ=Serveur Time Zone
+PHPTZ=PHP Time Zone
 PHPServerOffsetWithGreenwich=Serveur PHP offset avec Greenwich (secondes)
+CurrentHour=Heure courante
 OSEnv=Environnement OS
 Box=Boîte
 Boxes=Boîtes