about summary refs log tree commit diff
path: root/ui-atom.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-02-08 15:06:27 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2016-02-08 18:29:11 +0100
commit75298209bf8386656b82f185e2901690ac5b671c (patch)
tree2b87a8890a1579b51dfc864ab247b05b4f1eced2 /ui-atom.c
parentAvoid DATE_STRFTIME for long/short dates (diff)
downloadcgit-pink-75298209bf8386656b82f185e2901690ac5b671c.tar.gz
cgit-pink-75298209bf8386656b82f185e2901690ac5b671c.zip
ui-atom: avoid DATE_STRFTIME
Git's DATE_STRFTIME ignores the timezone argument and just uses the
local timezone regardless of whether the "local" flag is set.

Since Atom accepts ISO8601 dates [1], we can use Git's
DATE_ISO8601_STRICT instead, which does get this right.  Additionally,
we never use the local timezone here so we can use the
date_mode_from_type() wrapper to simplify the code a bit.

[1] https://tools.ietf.org/html/rfc4287#section-3.3

Signed-off-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-atom.c')
-rw-r--r--ui-atom.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/ui-atom.c b/ui-atom.c
index 0bf2cf2..41838d3 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -17,11 +17,6 @@ static void add_entry(struct commit *commit, const char *host)
 	char *hex;
 	char *mail, *t, *t2;
 	struct commitinfo *info;
-	struct date_mode mode = {
-		.type = DATE_STRFTIME,
-		.strftime_fmt = FMT_ATOMDATE,
-		.local = 0,
-	};
 
 	info = cgit_parse_commit(commit);
 	hex = oid_to_hex(&commit->object.oid);
@@ -30,7 +25,8 @@ static void add_entry(struct commit *commit, const char *host)
 	html_txt(info->subject);
 	html("</title>\n");
 	html("<updated>");
-	html_txt(show_date(info->committer_date, 0, &mode));
+	html_txt(show_date(info->committer_date, 0,
+                    date_mode_from_type(DATE_ISO8601_STRICT)));
 	html("</updated>\n");
 	html("<author>\n");
 	if (info->author) {
@@ -55,7 +51,8 @@ static void add_entry(struct commit *commit, const char *host)
 	}
 	html("</author>\n");
 	html("<published>");
-	html_txt(show_date(info->author_date, 0, &mode));
+	html_txt(show_date(info->author_date, 0,
+                    date_mode_from_type(DATE_ISO8601_STRICT)));
 	html("</published>\n");
 	if (host) {
 		char *pageurl;