luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

datetime: Use %Z for the timezone name

Browse Source 
We should try and follow strftime(3) for the format control characters
as much as possible.
This commit is contained in:
Emmanuele Bassi 2010-08-25 12:14:04 +01:00
parent b4c0b958af
commit 0a59ab6e85
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gdatetime.c
View File

@ -1809,7 +1809,7 @@ g_date_time_new_now (void)
* the date. * the date.
* %%y The year as a decimal number without the century. * %%y The year as a decimal number without the century.
* %%Y The year as a decimal number including the century. * %%Y The year as a decimal number including the century.
* %%z The timezone or name or abbreviation. * %%Z Alphabetic time zone abbreviation (e.g. EDT).
* %%% A literal %% character. * %%% A literal %% character.
* *
* Return value: a newly allocated string formatted to the requested format or * Return value: a newly allocated string formatted to the requested format or
@ -1983,7 +1983,7 @@ g_date_time_printf (const GDateTime *datetime,
g_string_append_printf (outstr, "%d", g_string_append_printf (outstr, "%d",
g_date_time_get_year (datetime)); g_date_time_get_year (datetime));
break; break;
case 'z': case 'Z':
if (datetime->tz) if (datetime->tz)
g_string_append_printf (outstr, "%s", datetime->tz->name); g_string_append_printf (outstr, "%s", datetime->tz->name);
else else

2
glib/tests/gdatetime.c
View File

@ -905,7 +905,7 @@ GDateTime *__dt = g_date_time_new_from_date (2009, 10, 24); \
TEST_PRINTF ("%%", "%"); TEST_PRINTF ("%%", "%");
TEST_PRINTF ("%", ""); TEST_PRINTF ("%", "");
TEST_PRINTF ("%9", NULL); TEST_PRINTF ("%9", NULL);
TEST_PRINTF ("%z", dst); TEST_PRINTF ("%Z", dst);
} }
gint gint