diff options
| author | Joey Hess <joey@kitenet.net> | 2012-02-02 22:27:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-02-02 22:27:55 -0400 |
| commit | c3f9ef82893f9c1eb4e16df6fb93bfc87b02c890 (patch) | |
| tree | 00fe1181591848a807cc0029e743418ea4c796e4 | |
| parent | be1cf943a6995e744da0359ec5ad49b7260b690d (diff) | |
| download | ikiwiki-c3f9ef82893f9c1eb4e16df6fb93bfc87b02c890.tar ikiwiki-c3f9ef82893f9c1eb4e16df6fb93bfc87b02c890.tar.gz | |
revert change to prettydate
Its strftime is from Date::Format, doesn't have the problem, and using the
POSIX one breaks its %o.
| -rw-r--r-- | IkiWiki/Plugin/prettydate.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm index b0931cb55..82d8a3df3 100644 --- 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 d196b49b9..c8db76966 100644 --- 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 |