updated from pesco's darcs repo, current to Oct 11 version

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 7382d4160cd84fe62f21daa366135dcabfde19f7..6c36de0a6b120b6047c44cca610bcd5e80333c29 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -6,18 +6,26 @@ use IkiWiki 2.00;
 no warnings;
 
 sub import { #{{{
-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "getsetup", id => "ddate", call => \&getsetup);
 } # }}}
 
-sub checkconfig () { #{{{
-       if (! defined $config{timeformat} ||
-           $config{timeformat} eq '%c') {
-               $config{timeformat}='on %A, the %e of %B, %Y. %N%nCelebrate %H';
-       }
+sub getsetup { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
 } #}}}
 
 sub IkiWiki::displaytime ($;$) { #{{{
        my $time=shift;
+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{timeformat};
+               if ($format eq '%c') {
+                       $format='on %A, the %e of %B, %Y. %N%nCelebrate %H';
+               }
+       }
        eval q{
                use DateTime;
                use DateTime::Calendar::Discordian;
@@ -27,7 +35,7 @@ sub IkiWiki::displaytime ($;$) { #{{{
        }
        my $dt = DateTime->from_epoch(epoch => $time);
        my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
-       return $dd->strftime($IkiWiki::config{timeformat});
+       return $dd->strftime($format);
 } #}}}
 
 5