X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=quotes.py;h=f68b34387596c77692f31648c31853c89d8c9b7a;hb=f3e614e5165dd316a66377f9a59ccaf301fde425;hp=9685220ab744e10a86e18d2b342486f109fd64d1;hpb=8cd38f1a95e0bd6542ba6704407b8ac33befd6ff;p=bots%2Fparrot.git

diff --git a/quotes.py b/quotes.py
index 9685220..f68b343 100644
--- a/quotes.py
+++ b/quotes.py
@@ -59,18 +59,25 @@ class Quote(object):
     
     def __unicode__(self):
         """ Retourne la quote affichable """
-        if self.place and self.place.strip() != u"":
-            return config.quote_template_withcontext % self.__dict__
-        else:
-            return config.quote_template % self.__dict__
+        return config.quote_template % self.__dict__
     def __str__(self):
         return unicode(self).encode("utf-8")
     
+    def display(self, show_context=False):
+        """
+        Retourne une chaîne contenant toujours la quote et l'auteur,
+        et le contexte ssi ``show_context = True``.
+        """
+        s = config.quote_template % self.__dict__
+        if show_context:
+            s = u"%s | %s" % (s, self.place)
+        return s.encode("utf-8")
+
     def full_str(self):
         """ Retourne une chaîne représentant la totalité des infos de la quote,
             tout en étant parsable et human-readable. """
-        place = self.place if self.place else ""
-        quoter = self.quoter if self.quoter else ""
+        place = self.place if self.place and self.place.strip() != u"" else u""
+        quoter = self.quoter if self.quoter and self.quoter.strip() != u"" else u""
         return (u"%s %s | %s | %s" % (self.timestamp.strftime("%F_%T"), config.quote_template % self.__dict__
                   , place, quoter)).encode("utf-8")