Render.pm: also use 'our' for $backlinks_calculated

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 18ddb94038361ce02ef25517e2496a54306a6a28..501f17f5d07e354246f0a149c4738943a38e999d 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -39,11 +39,34 @@ sub default_timetable {
        ];
 }
 
-sub import { #{{{
-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "prettydate", call => \&getsetup);
+       hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+               prettydateformat => {
+                       type => "string",
+                       example => '%X, %B %o, %Y',
+                       description => "format to use to display date",
+                       advanced => 1,
+                       safe => 1,
+                       rebuild => 1,
+               },
+               timetable => {
+                       type => "internal",
+                       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';
@@ -59,10 +82,14 @@ sub checkconfig () { #{{{
                        $config{timetable}[$h] = $config{timetable}[$h - 1];
                }
        }
-} #}}}
+}
 
-sub IkiWiki::displaytime ($) { #{{{
+sub IkiWiki::formattime ($;$) {
        my $time=shift;
+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{prettydateformat};
+       }
        
        eval q{use Date::Format};
        error($@) if $@;
@@ -93,9 +120,8 @@ 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);
-} #}}}
+}
 
 1