X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ebac5236869862d7f7e776402212f6b9731b326a..1f56dead00ee1188d9ed9650b9b2483b69c4d525:/IkiWiki/Plugin/ddate.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 7382d4160..bb77ce59f 100644
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -2,22 +2,30 @@
 # Discordian date support fnord ikiwiki.
 package IkiWiki::Plugin::ddate;
 
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 no warnings;
 
-sub import { #{{{
-	hook(type => "checkconfig", id => "skeleton", 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};
+		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