Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index 2ec1228333c591baeb0288cd80f9972efc15b52d..3470640dc1ed30748181d14118847680cbd47284 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -5,31 +5,26 @@ package IkiWiki::Plugin::ddate;
 use IkiWiki 2.00;
 no warnings;
 
-sub import { #{{{
+sub import {
        hook(type => "getsetup", id => "ddate", call => \&getsetup);
-       hook(type => "checkconfig", id => "ddate", call => \&checkconfig);
-} # }}}
+}
 
-sub getsetup { #{{{
+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';
-       }
-} #}}}
-
-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;
@@ -41,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);
-} #}}}
+}
 
 5