--- widgets/misc/e-dateedit.c.orig	Fri Apr  6 14:34:27 2007
+++ widgets/misc/e-dateedit.c	Fri Apr  6 17:36:10 2007
@@ -1435,13 +1435,11 @@
 
 			if (priv->use_24_hour_format)
 				/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-				format = _("%H:%M");
+				e_time_format_time (&tmp_tm, 1, 0, buffer, sizeof (buffer));
 			else
 				/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-				format = _("%I:%M %p");
+				e_time_format_time (&tmp_tm, 0, 0, buffer, sizeof (buffer));
 
-			e_utf8_strftime (buffer, sizeof (buffer), format, &tmp_tm);
-
 			/* For 12-hour am/pm format, we want space padding, not zero padding. This
 			 * can be done with strftime's %l, but it's a potentially unportable extension. */
 			if (!priv->use_24_hour_format && buffer [0] == '0')
@@ -1485,6 +1483,8 @@
 		return TRUE;
 	}
 
+	printf( "Parset time for %s\n", time_text );
+
 	if (e_time_parse_time (time_text, time_tm) != E_TIME_PARSE_OK)
 		return FALSE;
 
@@ -1762,12 +1762,11 @@
 
 		if (priv->use_24_hour_format)
 			/* This is a strftime() format. %H = hour (0-23), %M = minute. */
-			format = _("%H:%M");
+			e_time_format_time (&tmp_tm, 1, 0, buffer, sizeof (buffer));
 		else
 			/* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */
-			format = _("%I:%M %p");
+			e_time_format_time (&tmp_tm, 0, 0, buffer, sizeof (buffer));
 
-		e_utf8_strftime (buffer, sizeof (buffer), format, &tmp_tm);
 		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry),
 				    buffer);
 	}
