From 28dd455ca022ac899be69054e71bfb81c74234bf Mon Sep 17 00:00:00 2001
From: bernat <none>
Date: Fri, 10 Feb 2006 22:40:21 +0100
Subject: [PATCH] Esthtisme.

darcs-hash:20060210214021-d1718-ec1be6d5034d439de234b9b1719307be803bb3ce.gz
---
 gestion/ldap_crans.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py
index d10f35b7..549a103f 100755
--- a/gestion/ldap_crans.py
+++ b/gestion/ldap_crans.py
@@ -212,9 +212,17 @@ class service:
         self.start=map(int,start)
         
     def __str__(self):
-        return "%s(%s) à partir du %s" % (self.nom, \
-              ','.join(self.args), \
-              ' et '.join(map(lambda t:time.strftime(date_format,time.gmtime(t)), self.start)))
+        starting = self.start
+        starting.sort()
+        dates = ' et '.join(map(lambda t: t<time.time() and \
+                                "maintenant" or time.strftime(date_format,
+                                                              time.gmtime(t)), 
+                                self.start))
+        dates = " à partir d%s %s" % (dates.startswith("maintenant") and "e" or "u",
+                                      dates)
+        return ("%s(%s)%s" % (self.nom,
+                             ','.join(self.args),
+                             dates)).replace(" et maintenant","")
 
 class crans_ldap:
     """