From 64b9364a8ee06a9cbcc622b04499470c60250bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=AFeul=20Rouquette?= <maieul@maieul.net>
Date: Tue, 9 Feb 2021 17:25:24 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20#3639=20le=20filtre=20|heure=5Fminute=20p?=
=?UTF-8?q?eut=20prendre=20en=20argument=20(optionnel)=20'abbr',=20pour=20?=
=?UTF-8?q?ne=20pas=20indiquer=20l'unit=C3=A9=20des=20minutes.=20|heures?=
=?UTF-8?q?=5Fminutes=20=3D>=2017h26min=20|heures=5Fminutes{abbr}=20=3D>?=
=?UTF-8?q?=2017h26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/filtres_dates.php | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/ecrire/inc/filtres_dates.php b/ecrire/inc/filtres_dates.php
index f4ec8fe71f..283d2a98ca 100644
--- a/ecrire/inc/filtres_dates.php
+++ b/ecrire/inc/filtres_dates.php
@@ -197,10 +197,18 @@ function secondes($numdate) {
* @link https://www.spip.net/5519
*
* @param string $numdate La date à extraire
+ * @param string $forme.
+ * - si vide, précise l'unité des minutes : 12h10min
+ * - si 'abbr' ne précise pas l'unité des minutes : 12h10
* @return string L'heure formatée dans la langue en cours.
**/
-function heures_minutes($numdate) {
- return _T('date_fmt_heures_minutes', array('h' => heures($numdate), 'm' => minutes($numdate)));
+function heures_minutes($numdate, $forme='') {
+ if ($forme !='abbr') {
+ return _T('date_fmt_heures_minutes', array('h' => heures($numdate), 'm' => minutes($numdate)));
+ }
+ else {
+ return _T('date_fmt_heures_minutes_court', array('h' => heures($numdate), 'm' => minutes($numdate)));
+ }
}
/**
--
GitLab