aboutsummaryrefslogtreecommitdiff
path: root/ui-shared.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-02-08 15:05:54 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2016-02-08 18:28:18 +0100
commit9c15f3c6954e43c5ffd36230e666eccf112803f2 (patch)
treec905d68a9798a25a9534de41679d4eacc615bd51 /ui-shared.c
parentbdcbe0922d7099ebd61d875709ea9408bc1d7543 (diff)
downloadcgit-9c15f3c6954e43c5ffd36230e666eccf112803f2.tar.gz
cgit-9c15f3c6954e43c5ffd36230e666eccf112803f2.tar.bz2
cgit-9c15f3c6954e43c5ffd36230e666eccf112803f2.zip
Avoid DATE_STRFTIME for long/short dates
Git's DATE_STRFTIME ignores the timezone argument and just uses the local timezone regardless of whether the "local" flag is set. Since our existing FMT_LONGDATE and FMT_SHORTDATE are pretty-much perfect matches to DATE_ISO8601 and DATE_SHORT, switch to taking a date_mode_type directly in cgit_date_mode(). Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-shared.c')
-rw-r--r--ui-shared.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/ui-shared.c b/ui-shared.c
index d1f9249..03dcc08 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -607,11 +607,10 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
path[len - 1] = tail;
}
-const struct date_mode *cgit_date_mode(const char *format)
+const struct date_mode *cgit_date_mode(enum date_mode_type type)
{
static struct date_mode mode;
- mode.type = DATE_STRFTIME;
- mode.strftime_fmt = format;
+ mode.type = type;
mode.local = ctx.cfg.local_time;
return &mode;
}
@@ -620,7 +619,7 @@ static void print_rel_date(time_t t, int tz, double value,
const char *class, const char *suffix)
{
htmlf("<span class='%s' title='", class);
- html_attr(show_date(t, tz, cgit_date_mode(FMT_LONGDATE)));
+ html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
htmlf("'>%.0f %s</span>", value, suffix);
}
@@ -637,9 +636,9 @@ void cgit_print_age(time_t t, int tz, time_t max_relative)
if (secs > max_relative && max_relative >= 0) {
html("<span title='");
- html_attr(show_date(t, tz, cgit_date_mode(FMT_LONGDATE)));
+ html_attr(show_date(t, tz, cgit_date_mode(DATE_ISO8601)));
html("'>");
- html_txt(show_date(t, tz, cgit_date_mode(FMT_SHORTDATE)));
+ html_txt(show_date(t, tz, cgit_date_mode(DATE_SHORT)));
html("</span>");
return;
}
@@ -781,7 +780,7 @@ void cgit_print_docend(void)
else {
htmlf("<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit %s</a> at ",
cgit_version);
- html_txt(show_date(time(NULL), 0, cgit_date_mode(FMT_LONGDATE)));
+ html_txt(show_date(time(NULL), 0, cgit_date_mode(DATE_ISO8601)));
html("</div>\n");
}
html("</div> <!-- id=cgit -->\n");