X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..94bd69c9b66f0871cdf31ce98a9218c5d9d6fc02:/IkiWiki/Plugin/ddate.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index b67702655..2ec122833 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -1,30 +1,46 @@
 #!/usr/bin/perl
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
-use IkiWiki;
+
+use IkiWiki 2.00;
 no warnings;
 
 sub import { #{{{
-	hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+	hook(type => "getsetup", id => "ddate", call => \&getsetup);
+	hook(type => "checkconfig", id => "ddate", call => \&checkconfig);
 } # }}}
 
+sub getsetup { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
 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;
-        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!)";
+	my $format=shift;
+	if (! defined $format) {
+		$format=$config{timeformat};
+	}
+	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($format);
 } #}}}
 
 5