Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index b31d30cd0643617518eede56ce0fcf16f357c69f..0f02142b06812cb7bb11bc0b5a98cde3e13f8526 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -40,9 +40,32 @@ sub default_timetable {
 }
 
 sub import { #{{{
 }
 
 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
+               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 () { #{{{
        if (! defined $config{prettydateformat} ||
            $config{prettydateformat} eq '%c') {
 sub checkconfig () { #{{{
        if (! defined $config{prettydateformat} ||
            $config{prettydateformat} eq '%c') {


@@ -61,8 +84,12 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{

        my $time=shift;
        my $time=shift;

+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{prettydateformat};
+       }

        
        eval q{use Date::Format};
        error($@) if $@;
        
        eval q{use Date::Format};
        error($@) if $@;


@@ -93,7 +120,6 @@ sub IkiWiki::displaytime ($;$) { #{{{
 
        $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
 
        $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);
 } #}}}
        $format=~s/\%X/$t/g;
        return strftime($format, \@t);
 } #}}}