diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index e216b55cbd4..54c28b04389 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -131,15 +131,6 @@ $var=!$var; print ''.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").''.$_SERVER["HTTP_ACCEPT_LANGUAGE"].''."\n"; $var=!$var; print ''.$langs->trans("CurrentUserLanguage").''.$langs->getDefaultLang().''."\n"; -/*$var=!$var; -print "".$langs->trans("LanguageBrowserParameter","LANG")."".$_ENV["LANG"]."\n"; -$var=!$var; -print "".$langs->trans("LanguageParameter","PHP LC_ALL")."".setlocale(LC_ALL,0)."\n"; -$var=!$var; -print "".$langs->trans("LanguageParameter","PHP LC_NUMERIC")."".setlocale(LC_NUMERIC,0)."\n"; -//$var=!$var; -//print "".$langs->trans("LanguageParameter","PHP LC_MONETARY")."".setlocale(LC_MONETARY,0)."\n"; -*/ // Thousands $var=!$var; $thousand=$langs->trans("SeparatorThousand"); @@ -163,12 +154,9 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' ')) } $var=!$var; print '=> price(1234.56)'.price(1234.56).''; -//print ''.$langs->trans("TimeZone").''.$langs->trans("Value").''."\n"; // Timezone - -$txt =$langs->trans("OSTZ").' (variable system TZ): '.$_ENV["TZ"].'
'."\n"; -$txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.ini_get("date.timezone").''."\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php - +$txt =$langs->trans("OSTZ").' (variable system TZ): '.($_ENV["TZ"]?$_ENV["TZ"]:$langs->trans("NotDefined")).'
'."\n"; +$txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone")?ini_get("date.timezone"):$langs->trans("NotDefined")).''."\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php if (function_exists('date_default_timezone_get')) { $var=!$var;