[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/date.ml

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    05/12/21 20:43:02

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : date.ml 

Log message:
        patch #4728

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.632&tr2=1.633&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/date.ml.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.632 mldonkey/distrib/ChangeLog:1.633
--- mldonkey/distrib/ChangeLog:1.632    Wed Dec 21 19:24:30 2005
+++ mldonkey/distrib/ChangeLog  Wed Dec 21 20:43:02 2005
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2005/12/21
+4728: fix date format (zet)
 4730: BT: parse path.utf-8 (zet)
 
 2005/12/19
Index: mldonkey/src/utils/lib/date.ml
diff -u mldonkey/src/utils/lib/date.ml:1.8 mldonkey/src/utils/lib/date.ml:1.9
--- mldonkey/src/utils/lib/date.ml:1.8  Wed Dec 14 21:22:07 2005
+++ mldonkey/src/utils/lib/date.ml      Wed Dec 21 20:43:02 2005
@@ -75,13 +75,13 @@
   let seconds = rest - minutes * 60 in
   match print_format with
     "long" ->
-       if days > 0 then
-         Printf.sprintf " %dd " days
-       else
-         if hours > 0 then
-           Printf.sprintf " %dh:%02d " hours minutes
-         else
-           Printf.sprintf " %dm:%02d " minutes seconds
+
+  if days > 0
+    then Printf.sprintf " %dd " days
+  else if hours > 0
+    then Printf.sprintf " %d:%02d:%02d " hours minutes seconds
+    else Printf.sprintf " %d:%02d " minutes seconds
+
   | "verbose" ->
        Printf.sprintf "%s%s%dm %ds"
          (if days > 0 then (string_of_int days) ^ "d " else "")