lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Pb de locale

Browse Source
This commit is contained in:
Laurent Destailleur 2005-07-02 13:19:18 +00:00
parent 60bb83874b
commit 4ceb88f525
6 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/about.php
View File

@ -34,7 +34,19 @@ require("./pre.inc.php");
llxHeader(); llxHeader();
print_fiche_titre( "Dolibarr ".DOL_VERSION,''); print_titre("Dolibarr");
print "<br>\n";
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
print "\n";
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".DOL_VERSION."</td></tr>\n";
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Language")." (LC_ALL)</td><td>".setlocale(LC_ALL,0)."</td></tr>\n";
print '</table>';
print '<br>';
print '<p>'; print '<p>';
print $langs->trans("Dolibarr est publié sous licence GNU/GPL"); print $langs->trans("Dolibarr est publié sous licence GNU/GPL");

4
htdocs/admin/system/index.php
View File

@ -45,6 +45,7 @@ print "<br>\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">Dolibarr</td></tr>\n";
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>" . DOL_VERSION . "</td></tr>\n";
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Language")." (LC_ALL)</td><td>".setlocale(LC_ALL,0)."</td></tr>\n";
print '</table>'; print '</table>';
print "<br>\n"; print "<br>\n";
@ -62,6 +63,7 @@ print '</table>';
print "<br>\n"; print "<br>\n";
// Serveur web
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("WebServer")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("WebServer")."</td></tr>\n";
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
@ -71,6 +73,7 @@ print '</table>';
print "<br>\n"; print "<br>\n";
// Php
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Php")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Php")."</td></tr>\n";
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".phpversion()."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".phpversion()."</td></tr>\n";
@ -79,6 +82,7 @@ print '</table>';
print "<br>\n"; print "<br>\n";
// Base de donnée
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n";

4
htdocs/admin/system/os.php
View File

@ -44,7 +44,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$lan
print "\n"; print "\n";
// Récupère l'OS au sens PHP // Récupère l'OS au sens PHP
print "<tr $bc[0]><td width=\"140\"><b>".$langs->trans("PHP_OS")."</b></td><td>".PHP_OS."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("PHP_OS")."</td><td>".PHP_OS."</td></tr>\n";
// Récupère la version de l'OS // Récupère la version de l'OS
ob_start(); ob_start();
@ -52,7 +52,7 @@ phpinfo();
$chaine = ob_get_contents(); $chaine = ob_get_contents();
ob_end_clean(); ob_end_clean();
eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg); eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg);
print "<tr $bc[1]><td width=\"140\"><b>".$langs->trans("Version")."</b></td><td>".$reg[1]."</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
print '</table>'; print '</table>';

7
htdocs/admin/system/web.php
View File

@ -41,11 +41,12 @@ print "<br>\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
print "<tr $bc[0]><td width=\"200\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("VirtualServerName")."</td><td>" . $_SERVER["SERVER_NAME"] . "</td></tr>\n"; print "<tr $bc[1]><td>".$langs->trans("VirtualServerName")."</td><td>" . $_SERVER["SERVER_NAME"] . "</td></tr>\n";
print "<tr $bc[0]><td width=\"200\">".$langs->trans("IP")."</td><td>".$_SERVER["SERVER_ADDR"]."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("IP")."</td><td>".$_SERVER["SERVER_ADDR"]."</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("Port")."</td><td>" . $_SERVER["SERVER_PORT"] . "</td></tr>\n"; print "<tr $bc[1]><td>".$langs->trans("Port")."</td><td>" . $_SERVER["SERVER_PORT"] . "</td></tr>\n";
print "<tr $bc[0]><td width=\"200\">".$langs->trans("DocumentRootServer")."</td><td>".$_SERVER["DOCUMENT_ROOT"]."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("DocumentRootServer")."</td><td>".$_SERVER["DOCUMENT_ROOT"]."</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("DataRootServer")."</td><td>" . DOL_DATA_ROOT . "</td></tr>\n";
print '</table>'; print '</table>';

54
htdocs/lib/functions.inc.php
View File

@ -312,36 +312,36 @@ function dolibarr_time_plus_duree($time,$duration_value,$duration_unit)
/** /**
\brief Formattage de la date \brief Formattage de la date en fonction de la langue $conf->langage
\param time date timestamp ou au format YYYY-MM-DD \param time date 'timestamp' ou format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
\param format format de la date "%d %b %Y" \param format format d'affichage de la date "%d %b %Y"
\return string date formatée \return string date formatée
*/ */
function dolibarr_print_date($time,$format="%d %b %Y") function dolibarr_print_date($time,$format="%d %b %Y")
{ {
// Analyse de la date // Analyse de la date
if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?',$time,$reg)) { if (eregi('^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?',$time,$reg)) {
// Date au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' // Date au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
$syear = $reg[1]; $syear = $reg[1];
$smonth = $reg[2]; $smonth = $reg[2];
$sday = $reg[3]; $sday = $reg[3];
$shour = $reg[4]; $shour = $reg[4];
$smin = $reg[5]; $smin = $reg[5];
if ($syear < 1970 && $_SERVER["WINDIR"]) if ($syear < 1970 && $_SERVER["WINDIR"])
{ {
// Le formatage ne peut etre appliqué car windows ne supporte pas la fonction // Le formatage ne peut etre appliqué car windows ne supporte pas la fonction
// mktime si l'année est inférieur à 1970. On retourne un format fixe // mktime si l'année est inférieur à 1970. On retourne un format fixe
return "$syear-$smonth-$sday"; return "$syear-$smonth-$sday";
} }
else else
{ {
return strftime($format,mktime($shour,$smin,0,$smonth,$sday,$syear)); return strftime($format,mktime($shour,$smin,0,$smonth,$sday,$syear));
} }
} }
else { else {
// Date est un timestamps // Date est un timestamps
return strftime($format,$time); return strftime($format,$time);
} }
} }

5
htdocs/master.inc.php
View File

@ -167,10 +167,13 @@ if (! defined('MAIN_LANG_DEFAULT'))
} }
$conf->langage=MAIN_LANG_DEFAULT; $conf->langage=MAIN_LANG_DEFAULT;
// On corrige $conf->language si il ne vaut pas le code long: fr_FR par exemple // On corrige $conf->langage si il ne vaut pas le code long: fr -> fr_FR par exemple
if (strlen($conf->langage) <= 3) { if (strlen($conf->langage) <= 3) {
$conf->langage = strtolower($conf->langage)."_".strtoupper($conf->langage); $conf->langage = strtolower($conf->langage)."_".strtoupper($conf->langage);
} }
$conf->langage_tiret=ereg_replace('_','-',$conf->langage);
setlocale(LC_ALL, $conf->langage_tiret); // Compenser pb de locale avec windows
setlocale(LC_ALL, $conf->langage); setlocale(LC_ALL, $conf->langage);
require_once(DOL_DOCUMENT_ROOT ."/translate.class.php"); require_once(DOL_DOCUMENT_ROOT ."/translate.class.php");