Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index c8cf3f66e25229175dae6499e87ac4c14a06b491..c73317b2f81cbb46abb48b2a55357e8d77adb625 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -1,29 +1,41 @@
 #!/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::Render; # so we can redefine it here:
+
+use IkiWiki 2.00;

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

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

 } # }}}
 
 } # }}}
 

-sub checkconfig () { #{{{
-       if (! defined $IkiWiki::config{timeformat} ||
-           $IkiWiki::config{timeformat} eq '%c') {
-               $IkiWiki::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 $time=shift;

-        eval q{use POSIX};
-        my $gregorian=POSIX::strftime("%d %m %Y", localtime($time));
-       my $date=`ddate +'$IkiWiki::config{timeformat}' $gregorian`;
-       chomp $date;
-       return $date;
+       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;
+       };
+       if ($@) {
+                return "some time or other ($@ -- hail Eris!)";
+       }
+       my $dt = DateTime->from_epoch(epoch => $time);
+       my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
+       return $dd->strftime($format);

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