diff --git a/lib/modules/Calendar.pmod/YMD.pmod b/lib/modules/Calendar.pmod/YMD.pmod index ca9bbd0c0dc246036353263bdbd74c08bc1bd0fe..32c1b550b3219da7a8b86efee1479c654217dc60 100644 --- a/lib/modules/Calendar.pmod/YMD.pmod +++ b/lib/modules/Calendar.pmod/YMD.pmod @@ -2523,7 +2523,8 @@ TimeofDay dwim_time(string what) string zone ) foreach ( ({ "%t", "%h:%*[ :]%m%*[ :]:%s", - "%h:%*[ :]%m" }), + "%h:%*[ :]%m", + "T%t"}), string todformat ) foreach ( ({ "%y-%M-%D (%*s) -W%W-%e (%e)", "%D%*[ /]%M%*[- /,]%y", @@ -2538,7 +2539,8 @@ TimeofDay dwim_time(string what) "%D%*[- /]%M", "%M%*[- /]%D", "%e%*[- /wv]%W%*[ -/]%y", - "%e%*[- /wv]%W" }), + "%e%*[- /wv]%W", + ""}), string dayformat ) { if ( (t=parse(dayformat+" "+todformat+zone,what)) ) return t; diff --git a/lib/modules/Calendar.pmod/mkrules.pike b/lib/modules/Calendar.pmod/mkrules.pike index 84d46b82b1c1b084066490c941988eb17a93aa32..ddd7c8a7a1b29c8673b915b3bbe928c757bb78b9 100644 --- a/lib/modules/Calendar.pmod/mkrules.pike +++ b/lib/modules/Calendar.pmod/mkrules.pike @@ -10,7 +10,7 @@ // and zic(8) is the usual compiler. // pike mkrules.pike ../data/{africa,antarctica,asia,australasia,backward,etcetera,europe,northamerica,pacificnew,southamerica,systemv} -// $Id: mkrules.pike,v 1.1 2000/07/12 19:36:16 mirar Exp $ +// $Id: mkrules.pike,v 1.2 2000/07/30 09:10:10 mirar Exp $ object cal=Calendar.ISO->set_timezone("UTC");