Modified src/include/lib/Garradin/Squelette_Filtres.php from [78dfc10a01] to [834784360e].

    72     72       }
    73     73   
    74     74       static public function date_perso($date, $format)
    75     75       {
    76     76           return Utils::strftime_fr($format, $date);
    77     77       }
    78     78   
    79         -    static public function date_intelligente($date)
           79  +    static public function date_intelligente($date, $avec_heure = true)
    80     80       {
           81  +        $jour = null;
           82  +        $heure = date('H\hi', $date);
           83  +
    81     84           if (date('Ymd', $date) == date('Ymd'))
    82         -            return 'Aujourd\'hui, '.date('H\hi', $date);
           85  +        {
           86  +            $jour = 'aujourd\'hui';
           87  +        }
    83     88           elseif (date('Ymd', $date) == date('Ymd', strtotime('yesterday')))
    84         -            return 'Hier, '.date('H\hi', $date);
           89  +        {
           90  +            $jour = 'hier';
           91  +        }
           92  +        elseif (date('Ymd', $date) == date('Ymd', strtotime('tomorrow')))
           93  +        {
           94  +            $jour = 'demain';
           95  +        }
    85     96           elseif (date('Y', $date) == date('Y'))
    86         -            return strtolower(Utils::strftime_fr('%e %B, %Hh%M', $date));
           97  +        {
           98  +            $jour = strtolower(Utils::strftime_fr('%e %B', $date));
           99  +        }
    87    100           else
    88         -            return strtolower(Utils::strftime_fr('%e %B %Y', $date));
          101  +        {
          102  +            $jour = strtolower(Utils::strftime_fr('%e %B %Y', $date));
          103  +        }
          104  +
          105  +        if ($avec_heure)
          106  +        {
          107  +            return sprintf('%s, %s', $jour, $heure);
          108  +        }
          109  +
          110  +        return $jour;
    89    111       }
    90    112   
    91    113       static public function date_atom($date)
    92    114       {
    93    115           return date(DATE_ATOM, $date);
    94    116       }
    95    117