From ef43bff1ca455cf9608d463408598924220cb4e3 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 2 Sep 2007 19:29:40 +0000 Subject: * Correct generation of RFC 3339 format times for atom/rss feeds. Always use gmtime for these since a time zone is not specified. --- IkiWiki/Plugin/inline.pm | 2 +- debian/changelog | 6 +++++- doc/bugs/Feeds_get_wrong_timezone..mdwn | 2 ++ po/ikiwiki.pot | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index f0c37c1e9..30b09d1ad 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -315,7 +315,7 @@ sub date_3339 ($) { #{{{ my $lc_time=POSIX::setlocale(&POSIX::LC_TIME); POSIX::setlocale(&POSIX::LC_TIME, "C"); - my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time)); + my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time)); POSIX::setlocale(&POSIX::LC_TIME, $lc_time); return $ret; } #}}} diff --git a/debian/changelog b/debian/changelog index ba71afbac..fd66e577b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,11 @@ ikiwiki (2.7) UNRELEASED; urgency=low `git-rev-parse --show-prefix` from all names reported by git-log. Patch by Jamey Sharp - -- Joey Hess Tue, 28 Aug 2007 22:15:52 -0400 + [ Joey Hess ] + * Correct generation of RFC 3339 format times for atom/rss feeds. Always use + gmtime for these since a time zone is not specified. + + -- Joey Hess Sun, 02 Sep 2007 15:25:36 -0400 ikiwiki (2.6.1) unstable; urgency=low diff --git a/doc/bugs/Feeds_get_wrong_timezone..mdwn b/doc/bugs/Feeds_get_wrong_timezone..mdwn index dd34bbbc6..87757883d 100644 --- a/doc/bugs/Feeds_get_wrong_timezone..mdwn +++ b/doc/bugs/Feeds_get_wrong_timezone..mdwn @@ -6,3 +6,5 @@ created/modified at 0312 GMT. This occurs in both RSS and Atom feeds, but not in the HTML pages (which suggests it's not the server at fault, or IkiWiki overall, but rather whatever's generating the RSS and Atom is converting timezones wrongly). + +> [[done]], I *think* (description was not entirely clear) --[[Joey]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index ec855db9f..a03d91705 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-28 23:01-0400\n" +"POT-Creation-Date: 2007-08-29 12:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3