diff options
author | Federico Mena Quintero <federico@nuclecu.unam.mx> | 1998-04-01 11:56:40 +0800 |
---|---|---|
committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-04-01 11:56:40 +0800 |
commit | 8a5a6f0d159014504eef07d1a4439885b5552280 (patch) | |
tree | 61c98872b04013d7297dd34abec6b3f9966bb530 | |
parent | a0487eaeb01996bfeed740c78862e0b15b66d6cd (diff) | |
download | gsoc2013-evolution-8a5a6f0d159014504eef07d1a4439885b5552280.tar.gz gsoc2013-evolution-8a5a6f0d159014504eef07d1a4439885b5552280.tar.zst gsoc2013-evolution-8a5a6f0d159014504eef07d1a4439885b5552280.zip |
New function, formats an hour/am_pm pair into a string of the form "3am",
1998-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx>
* timeutil.c (format_simple_hour): New function, formats an
hour/am_pm pair into a string of the form "3am", "12pm", "05h",
"19h", etc. It is used by the day view widget for its labels.
svn path=/trunk/; revision=83
-rw-r--r-- | calendar/ChangeLog | 6 | ||||
-rw-r--r-- | calendar/timeutil.c | 32 | ||||
-rw-r--r-- | calendar/timeutil.h | 26 |
3 files changed, 62 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a5bf2c7975..e5aa6d0de2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +1998-03-31 Federico Mena Quintero <federico@nuclecu.unam.mx> + + * timeutil.c (format_simple_hour): New function, formats an + hour/am_pm pair into a string of the form "3am", "12pm", "05h", + "19h", etc. It is used by the day view widget for its labels. + 1998-03-31 Craig Small <csmall@small.dropbear.id.au> * Now has (non working) session maangement diff --git a/calendar/timeutil.c b/calendar/timeutil.c index 2de1fa4b2b..fb3bce4582 100644 --- a/calendar/timeutil.c +++ b/calendar/timeutil.c @@ -1,5 +1,13 @@ -#include <glib.h> -#include <time.h> +/* Miscellaneous time-related utilities + * + * Copyright (C) 1998 The Free Software Foundation + * + * Authors: Federico Mena <federico@nuclecu.unam.mx> + * Miguel de Icaza <miguel@nuclecu.unam.mx> + */ + +#include <libgnome/libgnome.h> +#include "timeutil.h" #define digit_at(x,y) (x [y] - '0') @@ -27,3 +35,23 @@ time_from_start_duration (time_t start, char *duration) printf ("Not yet implemented\n"); return 0; } + +char * +format_simple_hour (int hour, int use_am_pm) +{ + char buf[256]; + + /* I don't know whether this is the best way to internationalize it. + * Does any language use different conventions? - Federico + */ + + if (use_am_pm) + sprintf (buf, "%d%s", + (hour == 0) ? 12 : (hour > 12) ? (hour - 12) : hour, + (hour < 12) ? _("am") : _("pm")); + else + sprintf (buf, "%02d%s", hour, _("h")); + + return buf; + +} diff --git a/calendar/timeutil.h b/calendar/timeutil.h new file mode 100644 index 0000000000..4f062b8923 --- /dev/null +++ b/calendar/timeutil.h @@ -0,0 +1,26 @@ +/* Miscellaneous time-related utilities + * + * Copyright (C) 1998 The Free Software Foundation + * + * Authors: Federico Mena <federico@nuclecu.unam.mx> + * Miguel de Icaza <miguel@nuclecu.unam.mx> + */ + +#ifndef TIMEUTIL_H +#define TIMEUTIL_H + + +#include <time.h> + + +time_t time_from_isodate (char *str); +time_t time_from_start_duration (time_t start, char *duration); + +/* Returns pointer to a statically-allocated buffer with a string of the form + * 3am, 4am, 12pm, 08h, 17h, etc. + * The string is internationalized, hopefully correctly. + */ +char *format_simple_hour (int hour, int use_am_pm); + + +#endif |