servicemp3.cpp: more simple/flexible streaming detection

[enigma2.git] / lib / python / Tools / FuzzyDate.py

diff --git a/lib/python/Tools/FuzzyDate.py b/lib/python/Tools/FuzzyDate.py
index c5055baf133dd7ec53e2101777a1928a695d10c9..00a86421296c4a9b7d5c8471cf4a5042ae6f4f59 100644 (file)
--- a/lib/python/Tools/FuzzyDate.py
+++ b/lib/python/Tools/FuzzyDate.py
@@ -1,16 +1,16 @@
-import time
+from time import localtime, time

 
 def FuzzyTime(t):
 
 def FuzzyTime(t):

-       d = time.localtime(t)
-       nt = time.time()
-       n = time.localtime()
+       d = localtime(t)
+       nt = time()
+       n = localtime()

        
        if d[:3] == n[:3]:
                # same day
        
        if d[:3] == n[:3]:
                # same day

-               date = "Today"
+               date = _("Today")

        elif ((t - nt) < 7*86400) and (nt < t):
                # same week
        elif ((t - nt) < 7*86400) and (nt < t):
                # same week

-               date = ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")[d[6]]
+               date = (_("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun"))[d[6]]

        elif d[0] == n[0]:
                # same year
                date = "%d.%d." % (d[2], d[1])
        elif d[0] == n[0]:
                # same year
                date = "%d.%d." % (d[2], d[1])


@@ -22,18 +22,18 @@ def FuzzyTime(t):
        return (date, timeres)
 
 if __name__ == "__main__":
        return (date, timeres)
 
 if __name__ == "__main__":

-       print "now:    %s %s" % FuzzyDate(time.time())
-       print "1 day:  %s %s" % FuzzyDate(time.time() + 86400)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *2)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *3)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *4)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *5)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *6)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *7)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *8)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *9)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *10)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *11)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *12)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *13)
-       print "2 days: %s %s" % FuzzyDate(time.time() + 86400 *14)
+       print "now:    %s %s" % FuzzyTime(time())
+       print "1 day:  %s %s" % FuzzyTime(time() + 86400)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *2)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *3)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *4)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *5)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *6)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *7)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *8)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *9)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *10)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *11)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *12)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *13)
+       print "2 days: %s %s" % FuzzyTime(time() + 86400 *14)