From 4ee36f5bdd7720ffc6b1a807cf6d027961716465 Mon Sep 17 00:00:00 2001 From: x99bachelart Date: Mon, 29 Sep 2003 11:53:07 +0000 Subject: [PATCH] more subtle... --- locales/fr.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 { -- 2.1.4