[glib] datetime: Show 12 instead of 0 for 12h hour format
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] datetime: Show 12 instead of 0 for 12h hour format
- Date: Mon, 17 Jan 2011 19:34:17 +0000 (UTC)
commit e8120dc4ce75b0cff6d45632e5d9037853ad51ae
Author: Ray Strode <rstrode redhat com>
Date: Mon Jan 17 14:15:18 2011 -0500
datetime: Show 12 instead of 0 for 12h hour format
The 12h mode hour format is computed by taking the
24h mode hour format modulo 12.
The conversion results in 12 noon getting erroneously
converted to 0.
This commit makes noon get the same special handling
as midnight.
glib/gdatetime.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index 7f83591..44e4c52 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -2297,7 +2297,7 @@ g_date_time_format (GDateTime *datetime,
g_string_append_printf (outstr, "%02d", g_date_time_get_hour (datetime));
break;
case 'I':
- if (g_date_time_get_hour (datetime) == 0)
+ if ((g_date_time_get_hour (datetime) % 12) == 0)
g_string_append (outstr, "12");
else
g_string_append_printf (outstr, "%02d", g_date_time_get_hour (datetime) % 12);
@@ -2309,7 +2309,7 @@ g_date_time_format (GDateTime *datetime,
g_string_append_printf (outstr, "%2d", g_date_time_get_hour (datetime));
break;
case 'l':
- if (g_date_time_get_hour (datetime) == 0)
+ if ((g_date_time_get_hour (datetime) % 12) == 0)
g_string_append (outstr, "12");
else
g_string_append_printf (outstr, "%2d", g_date_time_get_hour (datetime) % 12);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]