* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index b677026558f457f8da0e48c605006771361eb905..6b67f420232adcc835800c5b4729a47a5a7eb1a6 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -1,30 +1,33 @@
 #!/usr/bin/perl
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 #!/usr/bin/perl
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;

-use IkiWiki;
+
+use IkiWiki 2.00;

 no warnings;
 
 sub import { #{{{
 no warnings;
 
 sub import { #{{{

-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "checkconfig", id => "ddate", call => \&checkconfig);

 } # }}}
 
 sub checkconfig () { #{{{
        if (! defined $config{timeformat} ||
            $config{timeformat} eq '%c') {
 } # }}}
 
 sub checkconfig () { #{{{
        if (! defined $config{timeformat} ||
            $config{timeformat} eq '%c') {

-               $config{timeformat}='on %{%A, the %e of %B%}, %Y. %N%nCelebrate %H';
+               $config{timeformat}='on %A, the %e of %B, %Y. %N%nCelebrate %H';

        }
 } #}}}
 
        }
 } #}}}
 

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

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

-        eval q{use POSIX};
-        my $gregorian=POSIX::strftime("%d %m %Y", localtime($time));
-       my $date=`ddate +'$config{timeformat}' $gregorian`;
-       chomp $date;
-       if ($? || ! length $date) {
-               return "some time or other (hail Eris!)";
+       eval q{
+               use DateTime;
+               use DateTime::Calendar::Discordian;
+       };
+       if ($@) {
+                return "some time or other ($@ -- hail Eris!)";

        }
        }

-       return $date;
+       my $dt = DateTime->from_epoch(epoch => $time);
+       my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
+       return $dd->strftime($IkiWiki::config{timeformat});

 } #}}}
 
 5
 } #}}}
 
 5