X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=locales%2Ffr.inc.php;h=b8a3e45f08a09c33e6f91295ea14c9cacf2dfeda;hb=4ee36f5bdd7720ffc6b1a807cf6d027961716465;hp=1488cde8e30c9c24d136281086fda8fabb35cd64;hpb=41c438e13278031ea4b30b6256056e07d91970e9;p=banana.git diff --git a/locales/fr.inc.php b/locales/fr.inc.php index 1488cde..b8a3e45 100644 --- a/locales/fr.inc.php +++ b/locales/fr.inc.php @@ -15,14 +15,15 @@ function locale_date($_text) { function locale_header_date($_text) { $date = getdate($_text); $now = time(); + $dnow = getdate($now); $days = array("dim","lun","mar","mer","jeu", "ven","sam"); $months = array("janv.","fév.","mars","avr.","mai","juin", "juil.","août","sept.","oct.","nov.","déc."); if ($now-$_text < 86400) { return date("H:i",$_text); - } elseif ($now-$_text < 2*86400) { - return "hier, ".date("H:i",$_text); + } elseif (($now-$_text < 2*86400) and ((($date["yday"]-$dnow["yday"])%365)==1)) { + return "hier ".date("H:i",$_text)." ".$date["yday"]." ".$dnow["yday"]; } elseif ($now-$_text < 604800) { return $days[$date["wday"]]." ".date("H:i",$_text); } else {