Nicolas Cannasse 17 years ago
parent
commit
a3d3fc9602
2 changed files with 6 additions and 8 deletions
  1. 1 0
      doc/CHANGES.txt
  2. 5 8
      std/DateTools.hx

+ 1 - 0
doc/CHANGES.txt

@@ -16,6 +16,7 @@
 	merge as3 classes
 	use flash9 fast switch for enums
 	always use match for enums (no switch even if constant)
+	fixed DateTools.format %I and %l in Flash/JS
 
 2007-10-31: 1.16
 	use _sans font for default flash traces (better Linux support)

+ 5 - 8
std/DateTools.hx

@@ -45,14 +45,11 @@ class DateTools {
 				__jsflash_format(d,"%m/%d/%y");
 			case "e":
 				untyped Std.string(d.getDate());
-			case "H":
-				untyped StringTools.lpad(Std.string(d.getHours()),"0",2);
-			case "I":
-				untyped StringTools.lpad(Std.string(d.getHours()%12),"0",2);
-			case "k":
-				untyped StringTools.lpad(Std.string(d.getHours())," ",2);
-			case "l":
-				untyped StringTools.lpad(Std.string(d.getHours()%12)," ",2);
+			case "H","k":
+				untyped StringTools.lpad(Std.string(d.getHours()),if( e == "H" ) "0" else " ",2);
+			case "I","l":
+				var hour = d.getHours()%12;
+				untyped StringTools.lpad(Std.string(hour == 0 ? 12 : hour),if( e == "I" ) "0" else " ",2);
 			case "m":
 				untyped StringTools.lpad(Std.string(d.getMonth()+1),"0",2);
 			case "M":