avoid setting default value in websetup_force_plugins

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 44ffb719e3b8aeb515b814784e52223b71c3f684..db5a94f413b567de7c73f2cb93ac90e1d9697461 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -22,7 +22,7 @@ sub default_timetable {
                gettext("early %A morning"),                    # 7
                "",                                             # 8
                "",                                             # 9
-               gettext("in mid-morning %A"),                   # 10
+               gettext("mid-morning %A"),                      # 10
                gettext("late %A morning"),                     # 11
                gettext("at lunch time on %A"),                 # 12
                "",                                             # 1
@@ -40,9 +40,27 @@ sub default_timetable {
 }
 
 sub import { #{{{
-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "getsetup", id => "prettydate", call => \&getsetup);
+       hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               prettydateformat => {
+                       type => "string",
+                       example => '%X, %B %o, %Y',
+                       description => "format to use to display date",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               timetable => {
+                       type => "internal",
+                       description => "array of time descriptions",
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+
 sub checkconfig () { #{{{
        if (! defined $config{prettydateformat} ||
            $config{prettydateformat} eq '%c') {
@@ -61,8 +79,12 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
-sub IkiWiki::displaytime ($) { #{{{
+sub IkiWiki::displaytime ($;$) { #{{{
        my $time=shift;
+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{prettydateformat};
+       }
        
        eval q{use Date::Format};
        error($@) if $@;
@@ -93,7 +115,6 @@ sub IkiWiki::displaytime ($) { #{{{
 
        $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
-       my $format=$config{prettydateformat};
        $format=~s/\%X/$t/g;
        return strftime($format, \@t);
 } #}}}