diff options
| author | Marek Kasik <mkasik@redhat.com> | 2009-02-12 12:12:30 +0000 |
|---|---|---|
| committer | Marek Kašík <mkasik@src.gnome.org> | 2009-02-12 12:12:30 +0000 |
| commit | 84125f132580b0e732ae34d46e284208baa1b080 (patch) | |
| tree | 63dfe37d0c064fcdeff617ab0104ecf0a36aade5 /modules | |
| parent | 4593d0eda84122499c109f1de9ac1bdc93de73c0 (diff) | |
| download | gtk+-84125f132580b0e732ae34d46e284208baa1b080.tar.gz | |
Bug 568571 – Asian am/pm format on cups print backend's time parsing
2009-02-12 Marek Kasik <mkasik@redhat.com>
Bug 568571 – Asian am/pm format on cups print backend's time parsing
* modules/printbackends/cups/gtkprintbackendcups.c: Add Asian am/pm
format into formats recognized by CUPS backend
svn path=/trunk/; revision=22319
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/printbackends/cups/gtkprintbackendcups.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c index 51dcc39ab3..0d2975f197 100644 --- a/modules/printbackends/cups/gtkprintbackendcups.c +++ b/modules/printbackends/cups/gtkprintbackendcups.c @@ -3529,16 +3529,20 @@ supports_am_pm (void) return length != 0; } -/* Converts local time to UTC time. Local time has to be in HH:MM format or - * in HH:MM:SS format or in HH:MM:SS {am, pm} format or in HH:MM {am, pm} format - * or in HH {am, pm} format. +/* Converts local time to UTC time. Local time has to be in one of these + * formats: HH:MM:SS, HH:MM, HH:MM:SS {am, pm}, HH:MM {am, pm}, HH {am, pm}, + * {am, pm} HH:MM:SS, {am, pm} HH:MM, {am, pm} HH. * Returns a newly allocated string holding UTC time in HH:MM:SS format * or NULL. */ gchar * localtime_to_utctime (const char *local_time) { - const char *formats_0[] = {" %I : %M : %S %p ", " %H : %M : %S ", " %I : %M %p ", " %H : %M ", " %I %p "}; + const char *formats_0[] = {" %I : %M : %S %p ", " %p %I : %M : %S ", + " %H : %M : %S ", + " %I : %M %p ", " %p %I : %M ", + " %H : %M ", + " %I %p ", " %p %I "}; const char *formats_1[] = {" %H : %M : %S ", " %H : %M "}; const char *end = NULL; struct tm *actual_local_time; |