summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-05 00:45:03 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-05 00:45:03 +0000
commit485a017a88949b92b59edf49197c4c09be910665 (patch)
tree381800c8bdd5276c65559426511dcaa5669065e8
parent831190e1f356a6e1b7b872786e6d07f9c747ea33 (diff)
* Fix dates in rss feeds if running localised, so they're still rfc 822.
-rw-r--r--IkiWiki/Plugin/inline.pm6
-rw-r--r--debian/changelog3
2 files changed, 7 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 4e64d9f8c..56adaf509 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -138,7 +138,11 @@ sub date_822 ($) { #{{{
my $time=shift;
eval q{use POSIX};
- return POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+ my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+ POSIX::setlocale(&POSIX::LC_TIME, "C");
+ my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
+ POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+ return $ret;
} #}}}
sub absolute_urls ($$) { #{{{
diff --git a/debian/changelog b/debian/changelog
index d68a37864..81057a046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,9 @@ ikiwiki (1.16) UNRELEASED; urgency=low
* Add a new format hook, and make tidy use it, since tidy can really only
operate on and output complete html documents, not the body chunks
that sanitise gets.
+ * Fix dates in rss feeds if running localised, so they're still rfc 822.
- -- Joey Hess <joeyh@debian.org> Fri, 4 Aug 2006 03:33:09 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 4 Aug 2006 20:43:42 -0400
ikiwiki (1.15) unstable; urgency=low