/*
- * $Id$
+ * Copyright (c) 1996-2010 by the citadel.org team
+ *
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "webcit.h"
#include "webserver.h"
#ifdef HAVE_USELOCALE
-extern locale_t wc_locales[];
+extern locale_t *wc_locales;
#endif
typedef unsigned char byte;
if (wc_locales[WC->selected_language] == NULL) {
return strftime(s, max, format, tm);
}
- else { /* TODO: this gives empty strings on debian. */
+ else {
return strftime_l(s, max, format, tm, wc_locales[WC->selected_language]);
}
#else
/*
* Format a date/time stamp for output
*/
-void webcit_fmt_date(char *buf, time_t thetime, int brief)
+void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format)
{
struct tm tm;
struct tm today_tm;
localtime_r(&thetime, &tm);
- if (brief) {
+ /*
+ * DATEFMT_FULL: full display
+ * DATEFMT_BRIEF: if date == today, show only the time
+ * otherwise, for messages up to 6 months old,
+ * show the month and day, and the time
+ * older than 6 months, show only the date
+ * DATEFMT_RAWDATE: show full date, regardless of age
+ * DATEFMT_LOCALEDATE: show full date as prefered for the locale
+ */
- /* If date == today, show only the time */
- if ((tm.tm_year == today_tm.tm_year)
- &&(tm.tm_mon == today_tm.tm_mon)
- &&(tm.tm_mday == today_tm.tm_mday)) {
- if (time_format == WC_TIMEFORMAT_24)
- wc_strftime(buf, 32, "%k:%M", &tm);
+ switch (Format) {
+ case DATEFMT_BRIEF:
+ if ((tm.tm_year == today_tm.tm_year)
+ &&(tm.tm_mon == today_tm.tm_mon)
+ &&(tm.tm_mday == today_tm.tm_mday)) {
+ if (time_format == WC_TIMEFORMAT_24)
+ wc_strftime(buf, siz, "%k:%M", &tm);
+ else
+ wc_strftime(buf, siz, "%l:%M%p", &tm);
+ }
+ else if (today_timet - thetime < 15552000) {
+ if (time_format == WC_TIMEFORMAT_24)
+ wc_strftime(buf, siz, "%b %d %k:%M", &tm);
+ else
+ wc_strftime(buf, siz, "%b %d %l:%M%p", &tm);
+ }
+ else {
+ wc_strftime(buf, siz, "%b %d %Y", &tm);
+ }
+ break;
+ case DATEFMT_FULL:
+ if (time_format == WC_TIMEFORMAT_24)
+ wc_strftime(buf, siz, "%a %b %d %Y %T %Z", &tm);
else
- wc_strftime(buf, 32, "%l:%M%p", &tm);
- }
- /* Otherwise, for messages up to 6 months old, show the month and day, and the time */
- else if (today_timet - thetime < 15552000) {
- if (time_format == WC_TIMEFORMAT_24)
- wc_strftime(buf, 32, "%b %d %k:%M", &tm);
- else
- wc_strftime(buf, 32, "%b %d %l:%M%p", &tm);
- }
- /* older than 6 months, show only the date */
- else {
- wc_strftime(buf, 32, "%b %d %Y", &tm);
- }
+ wc_strftime(buf, siz, "%a %b %d %Y %r %Z", &tm);
+ break;
+ case DATEFMT_RAWDATE:
+ wc_strftime(buf, siz, "%a %b %d %Y", &tm);
+ break;
+ case DATEFMT_LOCALEDATE:
+ wc_strftime(buf, siz, "%x", &tm);
+ break;
}
- else {
- if (time_format == WC_TIMEFORMAT_24)
- wc_strftime(buf, 32, "%a %b %d %Y %T %Z", &tm);
- else
- wc_strftime(buf, 32, "%a %b %d %Y %r %Z", &tm);
+}
+
+
+/*
+ * Try to guess whether the user will prefer 12 hour or 24 hour time based on the locale.
+ */
+long guess_calhourformat(void) {
+ char buf[64];
+ struct tm tm;
+ memset(&tm, 0, sizeof tm);
+ wc_strftime(buf, 64, "%X", &tm);
+ if (buf[strlen(buf)-1] == 'M') {
+ return 12;
}
+ return 24;
}
time_format_cache = &(WC->time_format_cache);
if (*time_format_cache == WC_TIMEFORMAT_NONE)
{
- get_pref_long("calhourformat", &calhourformat, 24);
+ get_pref_long("calhourformat", &calhourformat, 99);
+
+ /* If we don't know the user's time format preference yet,
+ * make a guess based on the locale.
+ */
+ if (calhourformat == 99) {
+ calhourformat = guess_calhourformat();
+ }
+
+ /* Now set the preference */
if (calhourformat == 24)
*time_format_cache = WC_TIMEFORMAT_24;
else
* buf the output buffer
* thetime time to format into buf
*/
-void fmt_time(char *buf, time_t thetime)
+void fmt_time(char *buf, size_t siz, time_t thetime)
{
struct tm *tm;
int hour;
hour = hour - 12;
if (time_format == WC_TIMEFORMAT_24) {
- sprintf(buf, "%d:%02d",
+ snprintf(buf, siz, "%d:%02d",
tm->tm_hour, tm->tm_min
);
}
else {
- sprintf(buf, "%d:%02d%s",
+ snprintf(buf, siz, "%d:%02d%s",
hour, tm->tm_min, ((tm->tm_hour > 12) ? "pm" : "am")
);
}
InitModule_DATETIME
(void)
{
- RegisterPreference(HKEY("calhourformat"), _("Time format"), PRF_INT, LoadTimeformatSettingsCache);
+ RegisterPreference("calhourformat", _("Time format"), PRF_INT, LoadTimeformatSettingsCache);
}
projects / citadel.git / blobdiff