revert change to prettydate

Its strftime is from Date::Format, doesn't have the problem, and using the
POSIX one breaks its %o.

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index b0931cb5533b36bcab5cbb3afa514ef75c51f132..82d8a3df3eeef1c0b4a45c532774637a2a3e5209 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -118,10 +118,10 @@ sub IkiWiki::formattime ($;$) {
                }
        }
 
-       $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime_utf8("%A", \@yest)}eg;
+       $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
        $format=~s/\%X/$t/g;
-       return strftime_utf8($format, \@t);
+       return strftime($format, \@t);
 }
 
 1

diff --git a/debian/changelog b/debian/changelog
index d196b49b9c72510b0034a45ecba31e93c0a601b9..c8db76966c97c4cd156d0227219b5b35c7f8f54b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,16 @@
-ikiwiki (3.20120116) UNRELEASED; urgency=low
+ikiwiki (3.20120202) unstable; urgency=low
 
   * mdwn: Added nodiscount setting, which can be used to avoid using the
     markdown discount engine, when maximum compatability is needed.
   * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
   * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
   * cvs: Various cleanups and testing. (Amitai Schlair)
-  * calendar, prettydate: Fix strftime encoding bug.
+  * calendar: Fix strftime encoding bug.
   * shortcuts: Fixed a broken shortcut to wikipedia (accidentially
     made into a shortcut to wikiMedia).
   * Various portability improvements. (Amitai Schlair)
 
- -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Feb 2012 21:42:40 -0400
 
 ikiwiki (3.20120115) unstable; urgency=low