clean up

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index d081cb5094d56b5030ba54f7504d911785000643..bb77ce59f267a5c9e541a1f42f88d6eca0eee4f1 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -2,25 +2,29 @@
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 no warnings;
 
 no warnings;
 

-sub import { #{{{
-       hook(type => "checkconfig", id => "ddate", call => \&checkconfig);
-} # }}}
+sub import {
+       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 ($;$) { #{{{
+sub IkiWiki::formattime ($;$) {

        my $time=shift;
        my $format=shift;
        if (! defined $format) {
                $format=$config{timeformat};
        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;
        }
        eval q{
                use DateTime;


@@ -32,6 +36,6 @@ sub IkiWiki::displaytime ($;$) { #{{{
        my $dt = DateTime->from_epoch(epoch => $time);
        my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
        return $dd->strftime($format);
        my $dt = DateTime->from_epoch(epoch => $time);
        my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
        return $dd->strftime($format);

-} #}}}
+}

 
 5
 
 5