From: x99bachelart <x99bachelart>
Date: Mon, 29 Sep 2003 11:53:07 +0000 (+0000)
Subject: more subtle...
X-Git-Tag: 1.8~387
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4ee36f5bdd7720ffc6b1a807cf6d027961716465;p=banana.git

more subtle...
---

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 {