calendar, prettydate: Fix strftime encoding bug

[ikiwiki.git] / IkiWiki / Plugin / prettydate.pm

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 080317f060a6da0030dba46018f84ba31829f099..b0931cb5533b36bcab5cbb3afa514ef75c51f132 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::prettydate;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use warnings;
 no warnings 'redefine';
 use strict;
@@ -33,36 +33,40 @@ sub default_timetable {
                gettext("%A evening"),                          # 6
                "",                                             # 7
                gettext("late %A evening"),                     # 8
-               "",                     # 9                     # 9
+               "",                                             # 9
                gettext("%A night"),                            # 10
                "",                                             # 11
        ];
 }
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "prettydate", call => \&getsetup);
        hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
                prettydateformat => {
                        type => "string",
-                       default => '%X, %B %o, %Y',
+                       example => '%X, %B %o, %Y',
                        description => "format to use to display date",
+                       advanced => 1,
                        safe => 1,
                        rebuild => 1,
                },
                timetable => {
                        type => "internal",
-                       default => undef,
                        description => "array of time descriptions",
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
        if (! defined $config{prettydateformat} ||
            $config{prettydateformat} eq '%c') {
                $config{prettydateformat}='%X, %B %o, %Y';
@@ -78,9 +82,9 @@ sub checkconfig () { #{{{
                        $config{timetable}[$h] = $config{timetable}[$h - 1];
                }
        }
-} #}}}
+}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) {
        my $time=shift;
        my $format=shift;
        if (! defined $format) {
@@ -114,10 +118,10 @@ sub IkiWiki::displaytime ($;$) { #{{{
                }
        }
 
-       $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
+       $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime_utf8("%A", \@yest)}eg;
 
        $format=~s/\%X/$t/g;
-       return strftime($format, \@t);
-} #}}}
+       return strftime_utf8($format, \@t);
+}
 
 1